Commit graph

5 commits

Author SHA1 Message Date
c30de5623a Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android
# Conflicts:
#	app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java
2016-07-08 14:49:05 +03:00
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
8cca1a447d Navbar experiment 2016-07-03 17:33:11 +03:00
aranzaiger
41b4b47a36 integrated new note dialog 2016-07-01 18:45:31 +03:00
8e9c0f7397 Bare Android Project 2016-07-01 14:11:36 +03:00