diff --git a/.gitignore b/.gitignore index 57157a1b1..80e465e8c 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ # Built application files *.apk *.ap_ +app/free_google/* # Files for the ART/Dalvik VM *.dex @@ -39,7 +40,6 @@ captures/ # Intellij *.iml -<<<<<<< HEAD .idea/workspace.xml .idea/tasks.xml .idea/gradle.xml @@ -49,19 +49,16 @@ captures/ # Keystore files # Uncomment the following line if you do not want to check your keystore files in. #*.jks -======= .idea/* # Keystore files *.jks ->>>>>>> master # External native build folder generated in Android Studio 2.2 and later .externalNativeBuild # Google Services (e.g. APIs or Firebase) google-services.json -<<<<<<< HEAD # Freeline freeline.py @@ -70,5 +67,11 @@ freeline_project_description.json # Iml Files app/app.iml -======= ->>>>>>> master + +# Art +art/screen*.png +art/logo_512.png + +# Dir linux +.directory +*/.directory diff --git a/ReadMe.md b/ReadMe.md index a593f5c92..6e91db609 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -27,13 +27,22 @@ Yes, KeePass is really free, and more than that: it is open source (OSI certifie Even if the application is free, to maintain the application, you can make donations. -[![Donation Paypal](https://4.bp.blogspot.com/-ncaIbUGaHOk/WfhaThYUPGI/AAAAAAAAAVQ/_HidNgdB1q4DaC24ujaKNzH64KUUJiQewCLcBGAs/s1600/pay-with-paypal.png "")](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=KM6QMDAXZM3UU "Kunzisoft Paypal Donation") +[![Donation Paypal](https://4.bp.blogspot.com/-ncaIbUGaHOk/WfhaThYUPGI/AAAAAAAAAVQ/_HidNgdB1q4DaC24ujaKNzH64KUUJiQewCLcBGAs/s1600/pay-with-paypal.png)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=KM6QMDAXZM3UU "Kunzisoft Paypal Donation") -[![Donation Liberapay](https://liberapay.com/assets/widgets/donate.svg "")](https://liberapay.com/Kunzisoft/donate "Kunzisoft Liberapay Donation") +[![Donation Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/Kunzisoft/donate "Kunzisoft Liberapay Donation") +## Download +[Get it on F-Droid](https://f-droid.org/en/packages/com.kunzisoft.keepass.libre/) + +[Get it on Google Play](https://play.google.com/store/apps/details?id=com.kunzisoft.keepass.free) + ### JNI Native library build instructions: diff --git a/art/feature_graphic.png b/art/feature_graphic.png new file mode 100644 index 000000000..85db1282f Binary files /dev/null and b/art/feature_graphic.png differ diff --git a/art/feature_graphic.svg b/art/feature_graphic.svg new file mode 100644 index 000000000..a5d0610a9 --- /dev/null +++ b/art/feature_graphic.svg @@ -0,0 +1,1186 @@ + + + +image/svg+xmlKeePass DX \ No newline at end of file