aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorknuthy <knuthy@gmail.com>2014-09-13 10:01:40 +0200
committerknuthy <knuthy@gmail.com>2014-09-13 10:01:40 +0200
commit2a66e5ea18538f27fc5876688f59979a473a9704 (patch)
treebb3d089f7d1d382c3331158b940cff5c1bfa4430
parentaaee40b93360881efffeae48ca76e10701a06ac2 (diff)
parent23915f5dd9b09256f24776fca765f0bf35a75412 (diff)
Merge remote-tracking branch 'origin/master'
-rw-r--r--.gitignore2
-rw-r--r--README.md2
2 files changed, 3 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 4b4c66b3..6ffad81e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,8 @@ release.properties
ant.properties
*.class
*.apk
+!app-release.apk
+!app-debug.apk
#Gradle
.gradle
diff --git a/README.md b/README.md
index 9b53cc52..501876a0 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ PwdStore
This application tries to be 100% compatible with [pass](http://www.zx2c4.com/projects/password-store/)
You can install the application either from the [Play Store](https://play.google.com/store/apps/details?id=com.zeapo.pwdstore),
-using the apk file found at `app/app-release.apk` or build everything from source.
+~~using the apk file found at `app/app-release.apk` or build everything from source.~~
Features
========