Commit Graph

6 Commits (2e36ea010a445295a451a00aaece42b081eb82ee)

Author SHA1 Message Date
Christoph Wurst 14c996d982
Use elseif instead of else if 6 years ago
Christoph Wurst 5bf3d1bb38
Update license headers 6 years ago
Julius Härtl a41ed39bf2
Always use the latest timestamp for merged activities 6 years ago
Morris Jobke 0eebff152a
Update license headers 8 years ago
Joas Schilling 644b37c7e4
Change the order on merging activities so the newest item is first 9 years ago
Joas Schilling da9468522b
Add an event merger and use it for the files activities 9 years ago