Philoul c716ac006b Merge remote-tracking branch 'origin/dev' into watch_strings ... # Conflicts: # wear/src/main/res/values/strings.xml		2019-12-05 18:26:57 +01:00
..
libs	remove sightparser-release	2019-04-07 23:08:55 +02:00
src	Merge remote-tracking branch 'origin/dev' into watch_strings	2019-12-05 18:26:57 +01:00
build.gradle	revert mockito version	2019-12-03 21:12:17 +01:00
fabric.properties	add bg language	2016-07-05 20:28:23 +02:00
google-services.json	Firebase integration	2019-04-04 17:15:45 +02:00
proguard-rules.pro	plugins refactoring	2016-08-05 23:54:03 +02:00