dtvv 09ae09db1b Merge remote-tracking branch 'origin/develop' into develop ... # Conflicts: # gradle/wrapper/gradle-wrapper.properties		2018-10-04 09:12:56 -05:00
..
gradle-wrapper.jar	First commit (Base Android Studio project)	2017-08-17 18:38:05 -03:00
gradle-wrapper.properties	Merge remote-tracking branch 'origin/develop' into develop	2018-10-04 09:12:56 -05:00