kolaente d59aee92e3 Resolved Conflicts ... Signed-off-by: Konrad <konrad@kola-entertainments.de>		2017-09-17 21:14:02 +02:00
..
gitignore	Synced gitignores with github repo (#1245)	2017-03-15 13:30:00 +01:00
label	Bindata is optional and over-writable on restart (#354)	2016-12-22 19:12:23 +01:00
license	Synced licenses with github repo (#1246)	2017-03-15 13:30:16 +01:00
locale	Resolved Conflicts	2017-09-17 21:14:02 +02:00
readme	Bindata is optional and over-writable on restart (#354)	2016-12-22 19:12:23 +01:00