Etoh f3497b3e7e Merge branch 'master' into chat-osd
Conflicts:
	.appveyor.yml
	.travis.yml
	syncplay/constants.py
	syncplay/messages_de.py
	syncplay/messages_ru.py
	syncplay/ui/ConfigurationGetter.py
	syncplay/ui/gui.py
2017-11-15 19:43:38 +00:00
..
2012-10-17 18:24:13 +02:00
2013-05-04 20:40:34 +02:00
2013-06-01 18:58:39 +01:00
2015-11-15 21:32:46 +00:00
2013-06-04 09:24:51 +01:00
2013-06-04 09:24:51 +01:00
2014-07-11 20:44:01 +01:00
2013-06-04 09:42:32 +01:00
2013-06-04 09:24:51 +01:00
2016-07-03 17:48:42 +01:00
2015-01-03 21:35:13 +00:00
2017-05-07 13:20:28 +01:00
2014-07-11 20:44:01 +01:00
2016-10-17 21:52:32 +01:00
2013-06-01 18:58:39 +01:00
2013-06-01 18:58:39 +01:00
2014-07-11 20:44:01 +01:00
2012-10-12 19:06:55 +02:00
2014-09-07 11:07:18 +02:00
2014-10-25 10:23:31 +01:00
2013-10-15 01:08:09 +01:00
2013-10-15 01:08:09 +01:00
2013-10-15 01:08:09 +01:00
2013-06-01 18:58:39 +01:00
2013-06-04 09:24:51 +01:00
2014-10-04 00:43:48 +01:00
2017-05-07 13:20:28 +01:00
2014-10-24 23:45:08 +01:00
2013-10-15 01:08:09 +01:00