3 commits

Author	SHA1	Message	Date
Morris Jobke	0eebff152a	Update license headers ... Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-11-06 16:56:19 +01:00
Joas Schilling	644b37c7e4	Change the order on merging activities so the newest item is first ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-03-28 17:19:34 +02:00
Joas Schilling	da9468522b	Add an event merger and use it for the files activities ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-25 15:36:11 +01:00