snipe 42f0975414 Merge remote-tracking branch 'origin/develop' ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # public/css/dist/all.css # public/css/dist/bootstrap-table.css # public/js/dist/bootstrap-table.js # public/mix-manifest.json		2023-04-25 22:19:27 -07:00
..
assets	Fixed semicolon parse error from #12832	2023-04-17 20:14:45 -07:00
lang	added ldap_location to settings	2023-04-25 11:44:04 -07:00
macros	Switched to translations for better autoglossonym support	2022-10-05 11:46:42 -07:00
views	Merge remote-tracking branch 'origin/develop'	2023-04-25 22:19:27 -07:00