snipe 5950ec27ab Merge remote-tracking branch 'origin/develop' ...

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

# Conflicts:
#	config/version.php
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/css/dist/skins/skin-black-dark.css
#	public/css/dist/skins/skin-black-dark.min.css
#	public/css/dist/skins/skin-blue-dark.css
#	public/css/dist/skins/skin-blue-dark.min.css
#	public/css/dist/skins/skin-green-dark.css
#	public/css/dist/skins/skin-green-dark.min.css
#	public/css/dist/skins/skin-orange-dark.css
#	public/css/dist/skins/skin-orange-dark.min.css
#	public/css/dist/skins/skin-red-dark.css
#	public/css/dist/skins/skin-red-dark.min.css
#	public/css/dist/skins/skin-yellow-dark.css
#	public/css/dist/skins/skin-yellow-dark.min.css
#	public/mix-manifest.json

2023-05-03 13:49:36 -07:00

..

css

Merge remote-tracking branch 'origin/develop'

2023-05-03 13:49:36 -07:00

img

actually added the icons haha

2023-03-15 15:07:07 -04:00

js

Merge remote-tracking branch 'origin/develop'

2023-04-25 22:19:27 -07:00

uploads

Fixed logo uploads

2020-04-27 23:22:52 -07:00

vendor/livewire

Update constraints to allow up to 8.2

2022-05-16 17:23:41 -07:00

.htaccess

Try conditiinal formatting to support apache 2.2 and 2.4

2022-05-13 18:01:06 -07:00

favicon.ico

Default favicon

2020-02-11 20:19:24 -08:00

index.php

Misc fixes for shift

2021-06-11 14:07:50 -07:00

mix-manifest.json

Merge remote-tracking branch 'origin/develop'

2023-05-03 13:49:36 -07:00

mix.js.map

Added resources

2020-04-22 07:15:24 -07:00

robots.txt

…

web.config

Fix for IIS+ Chrome not showing webfonts

2017-11-06 16:51:46 -08:00