snipe 2db6cf85a7 Merge remote-tracking branch 'origin/develop' ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # config/version.php		2022-05-24 15:10:46 -07:00
..
assets	Merge pull request #11152 from Godmartinz/link_inconsistentcies	2022-05-18 15:45:30 -07:00
lang	Merge remote-tracking branch 'origin/develop'	2022-05-24 15:10:46 -07:00
macros
views	Nicer styling	2022-05-24 14:39:01 -07:00