nathangray 9be653e226 Adapt app-specific merges to 186e03671a		2021-06-23 11:31:47 -06:00
..
inc	Adapt app-specific merges to 186e03671a	2021-06-23 11:31:47 -06:00
js	Fix missing dhtmlx menu object	2021-06-10 13:59:12 +02: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:24 +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