Mathieu Sanchez 3b2bf5f0ae Merge branch 'ms/issue-14/adding-pickers' into beta ... # Conflicts: # app/build.gradle		2020-05-02 15:46:43 +02:00
..
src	Adding pickers for date and time	2020-05-02 15:46:08 +02:00
.gitignore	Adding base app	2020-04-12 01:17:34 +02:00
build.gradle	Version 1.0.5 version code 7	2020-05-02 14:54:18 +02:00
proguard-rules.pro	Issue-8: Adding Keep class com.showckwave to proguard	2020-04-26 10:14:47 +02:00