nathan 82103dd514 * Collabora: Merge placeholder dialogs ... Added merge placeholder & address dialogs to Collabora. Also some new merge preferences for target filename and location, and placeholder list UI		2021-10-14 13:18:21 -06:00
..
inc	* Collabora: Merge placeholder dialogs	2021-10-14 13:18:21 -06:00
js	Apply client-side push refactoring to calendar, infolog, timesheet	2021-03-04 11:27:35 -07:00
lang	pending translations from our translation server	2020-10-28 13:51:14 +01:00
setup	Bump version to 21.1	2021-05-08 15:02:53 +02:00
templates	* Timesheet: Fix created was overlapping with status	2021-04-13 13:28:56 -06:00
index.php	update to only use new Api, incl. dependency to only api (no more phpgwapi and etemplate)	2016-04-26 18:27:29 +00:00