Tomas Groth 078c8d41eb Fix unresolved conflict - for real.		2019-02-03 21:45:24 +01:00
..
openlp_core	Fix unresolved conflict - for real.	2019-02-03 21:45:24 +01:00
openlp_plugins	merge trunk	2018-10-30 20:46:55 +01:00
__init__.py	End of 2017	2017-12-29 09:15:48 +00:00