snipe 21e78bee71 Merge remote-tracking branch 'origin/develop' ...

Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	package-lock.json
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json

2023-04-15 21:05:18 -07:00

..

assets

Changed colors for disabled, removed dupe checkmark

2023-04-03 23:53:57 -07:00

lang

Fixed unclosed parens in translation file

2023-04-13 12:05:06 -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-15 21:05:18 -07:00