Merge branch 'platform-27' into 'master'

[fdroidserver.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index a606026bc046d357d797730588a937782e9b46b0..b92ef773a22ee062032c6d7e0d779aa9441379b3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,7 @@ env/
 fdroidserver.egg-info/
 pylint.parseable
 /.testfiles/
-docs/html/
+README.rst
 
 # files generated by tests
 tmp/
@@ -28,6 +28,7 @@ tmp/
 makebuildserver.config.py
 /tests/.fdroid.keypass.txt
 /tests/.fdroid.keystorepass.txt
+/tests/.java.security
 /tests/fdroid-icon.png
 /tests/OBBMainOldVersion.apk
 /tests/OBBMainPatchCurrent.apk
@@ -44,3 +45,6 @@ makebuildserver.config.py
 /tests/repo/info.guardianproject.checkey/en-US/phoneScreenshots/checkey.png
 /tests/urzip-πÇÇπÇÇ现代汉语通用字-български-عربي1234.apk
 /unsigned/
+
+# generated by gettext
+locale/*/LC_MESSAGES/fdroidserver.mo