Daniele Gobbetti 5c0c5581bb Merge branch 'master' into background-javascript ... # Conflicts: # app/src/main/assets/app_config/js/gadgetbridge_boilerplate.js # app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java # app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java		2017-04-08 21:16:01 +02:00
..
app_config	Merge branch 'master' into background-javascript	2017-04-08 21:16:01 +02:00
devintro.png	run optipng on all pngs	2016-09-21 09:25:33 +02:00
devintro.xmi	Component diagram giving an overview	2016-01-26 23:05:54 +01:00
ic_launcher.svg	Some more logging + add svg launcher again (somehow it was not added again)	2016-03-30 22:53:08 +02:00
logback.xml	Don't flush the logfile synchronously	2016-03-07 22:46:35 +01:00