Merge branch 'master' into 'master'

[fdroidserver.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 3bccb197d772d4f9b9f143e8be885fb5ed08cbb2..be36e3745195869663793741a3b0f77dcb27dfe6 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
@@ -35,9 +36,12 @@ makebuildserver.config.py
 /tests/archive/categories.txt
 /tests/archive/icons*
 /tests/archive/index.jar
+/tests/archive/index_unsigned.jar
 /tests/archive/index.xml
 /tests/archive/index-v1.jar
+/tests/archive/index-v1.json
 /tests/repo/index.jar
+/tests/repo/index_unsigned.jar
 /tests/repo/index-v1.jar
 /tests/repo/info.guardianproject.urzip/
 /tests/repo/info.guardianproject.checkey/en-US/phoneScreenshots/checkey-phone.png