chiark
/
gitweb
/
~ianmdlvl
/
fdroidserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'api-24' into 'master'
[fdroidserver.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index 4371053fdd698911dcf33f60cad4defda046f535..1c57aac4c89329ef613eeda72604d7e0f2b04b50 100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-12,6
+12,8
@@
env/
fdroidserver.egg-info/
pylint.parseable
/.testfiles/
+docs/html/
# files generated by tests
-tests/local.properties
+tmp/
+tests/repo/icons*