summaryrefslogtreecommitdiff
path: root/vendor/gitignore/Android.gitignore
diff options
context:
space:
mode:
authorDJ Mountney <david@twkie.net>2017-03-08 15:16:47 -0800
committerDJ Mountney <david@twkie.net>2017-03-08 15:16:47 -0800
commit65f6abffc4349131ebb75f8ded0f417933c4a50e (patch)
tree24b702147ab9d37ef66eb5500a86370fe286de81 /vendor/gitignore/Android.gitignore
parent1110b2f18c1a5397df71979fcc3fc8fabe87576d (diff)
downloadgitlab-ce-65f6abffc4349131ebb75f8ded0f417933c4a50e.tar.gz
Update the gitignore and gitlab-ci templates for 9.0
Diffstat (limited to 'vendor/gitignore/Android.gitignore')
-rw-r--r--vendor/gitignore/Android.gitignore3
1 files changed, 2 insertions, 1 deletions
diff --git a/vendor/gitignore/Android.gitignore b/vendor/gitignore/Android.gitignore
index a1a65c2d72e..520a86352f7 100644
--- a/vendor/gitignore/Android.gitignore
+++ b/vendor/gitignore/Android.gitignore
@@ -37,6 +37,7 @@ captures/
.idea/workspace.xml
.idea/tasks.xml
.idea/gradle.xml
+.idea/dictionaries
.idea/libraries
# Keystore files
@@ -48,7 +49,7 @@ captures/
# Google Services (e.g. APIs or Firebase)
google-services.json
-#Freeline
+# Freeline
freeline.py
freeline/
freeline_project_description.json