Android course project
Go to file
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
.idea Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 2016-07-06 20:30:57 +03:00
app Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 2016-07-06 20:30:57 +03:00
gradle/wrapper Bare Android Project 2016-07-01 14:11:36 +03:00
.gitignore Initial Commit 2016-07-01 14:07:41 +03:00
build.gradle change new note dialog 2016-07-01 17:09:38 +03:00
gradle.properties Bare Android Project 2016-07-01 14:11:36 +03:00
gradlew Bare Android Project 2016-07-01 14:11:36 +03:00
gradlew.bat Bare Android Project 2016-07-01 14:11:36 +03:00
settings.gradle Bare Android Project 2016-07-01 14:11:36 +03:00