tibbi c8ccb616f6 handle conflict resolutions at file move too, not just at copy		2018-09-19 22:06:19 +02:00
..
src/main	handle conflict resolutions at file move too, not just at copy	2018-09-19 22:06:19 +02:00
.gitignore
build.gradle	update Glide to 4.8.0	2018-08-20 19:46:52 +02:00
proguard-rules.pro	adding a couple additional Glide Proguard rules	2018-07-29 22:09:17 +02:00