Matan Bar Yosef aef9568ba6 Merge remote-tracking branch 'origin/master' ... # Conflicts: # .idea/libraries/animated_vector_drawable_23_3_0.xml # .idea/libraries/appcompat_v7_23_3_0.xml # .idea/libraries/design_23_3_0.xml # .idea/libraries/recyclerview_v7_23_3_0.xml # .idea/libraries/support_annotations_23_3_0.xml # .idea/libraries/support_v4_23_3_0.xml # .idea/libraries/support_vector_drawable_23_3_0.xml # app/src/main/res/values/strings.xml		2016-07-03 16:07:27 +03:00
..
src	Merge remote-tracking branch 'origin/master'	2016-07-03 16:07:27 +03:00
.gitignore	Bare Android Project	2016-07-01 14:11:36 +03:00
build.gradle	integrated new note dialog	2016-07-01 18:45:31 +03:00
proguard-rules.pro	Bare Android Project	2016-07-01 14:11:36 +03:00