Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZ.J. van de Weg <zegerjan@gitlab.com>2016-06-16 11:39:17 +0300
committerAlfredo Sumaran <alfredo@gitlab.com>2016-06-20 22:48:28 +0300
commit96ae6099dd5921ae32139a206d598043520fb506 (patch)
treed8d2fdcecbffa8139b566ccdaca83e1c7ad02e74 /vendor/gitignore/Android.gitignore
parent8039856d80ce710f69af611f58857b29b74712b4 (diff)
Run rake gitlab:update_templates
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 a8368751267..f6b286cea98 100644
--- a/vendor/gitignore/Android.gitignore
+++ b/vendor/gitignore/Android.gitignore
@@ -2,7 +2,7 @@
*.apk
*.ap_
-# Files for the Dalvik VM
+# Files for the ART/Dalvik VM
*.dex
# Java class files
@@ -34,6 +34,7 @@ captures/
# Intellij
*.iml
+.idea/workspace.xml
# Keystore files
*.jks