aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Stefan Malzner <stefan@adlk.io>2019-03-05 15:54:37 +0100
committerLibravatar Stefan Malzner <stefan@adlk.io>2019-03-05 15:54:37 +0100
commit38dde1950bd11ddff5e49247c9eb0217c2f9a4ad (patch)
treeba9ee20766d9c752d21f363cfa959341cf8c65b3
parentfeat(App): Update electron to 4.0.7 (diff)
parentignore intellij idea project files (diff)
downloadferdium-app-38dde1950bd11ddff5e49247c9eb0217c2f9a4ad.tar.gz
ferdium-app-38dde1950bd11ddff5e49247c9eb0217c2f9a4ad.tar.zst
ferdium-app-38dde1950bd11ddff5e49247c9eb0217c2f9a4ad.zip
Merge branch 'develop' of https://github.com/meetfranz/franz into develop
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 192a261f0..a5677f0b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ node_modules
2flow-typed 2flow-typed
3out 3out
4.DS_Store 4.DS_Store
5.idea
5build 6build
6.tmp 7.tmp
7.stage 8.stage