summaryrefslogtreecommitdiffstats
path: root/lib/private/Activity/EventMerger.php
Commit message (Expand)AuthorAgeFilesLines
* Update license headers for 19Christoph Wurst2020-04-291-0/+1
* Use elseif instead of else ifChristoph Wurst2020-04-101-1/+1
* Update license headersChristoph Wurst2019-12-051-1/+2
* Always use the latest timestamp for merged activitiesJulius Härtl2019-10-091-1/+2
* Update license headersMorris Jobke2017-11-061-0/+2
* Change the order on merging activities so the newest item is firstJoas Schilling2017-03-281-4/+4
* Add an event merger and use it for the files activitiesJoas Schilling2016-11-251-0/+256