Merge remote-tracking branch 'origin/master'

This commit is contained in:
knuthy 2014-09-13 10:01:40 +02:00
commit 2a66e5ea18
2 changed files with 3 additions and 1 deletions

2
.gitignore vendored
View file

@ -8,6 +8,8 @@ release.properties
ant.properties
*.class
*.apk
!app-release.apk
!app-debug.apk
#Gradle
.gradle

View file

@ -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
========