Aran Zaiger 2ca5d59ee2 Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android ... # 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_4_0.xml # .idea/libraries/support_v4_23_3_0.xml # .idea/libraries/support_vector_drawable_23_3_0.xml # app/src/main/AndroidManifest.xml # app/src/main/res/values/strings.xml		2016-07-06 20:30:57 +03:00
..
copyright	Bare Android Project	2016-07-01 14:11:36 +03:00
inspectionProfiles	Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android	2016-07-03 15:55:10 +03:00
libraries	Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android	2016-07-06 20:30:57 +03:00
.name	Bare Android Project	2016-07-01 14:11:36 +03:00
compiler.xml	Bare Android Project	2016-07-01 14:11:36 +03:00
encodings.xml	Bare Android Project	2016-07-01 14:11:36 +03:00
gradle.xml	added limitation in adding note	2016-07-03 14:32:08 +03:00
misc.xml	New Style - Fixed some layout issues	2016-07-04 17:54:05 +03:00
modules.xml	- added throw button to note_view_full	2016-07-01 17:51:52 +03:00
runConfigurations.xml	Bare Android Project	2016-07-01 14:11:36 +03:00
vcs.xml	added personalSpaceActivity and Note	2016-07-01 16:34:32 +03:00