snipe 61a6c83418 Merge remote-tracking branch 'origin/develop' ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # public/css/dist/skins/skin-black.css # public/css/dist/skins/skin-black.min.css # public/css/dist/skins/skin-blue.css # public/css/dist/skins/skin-blue.min.css # public/css/dist/skins/skin-green.css # public/css/dist/skins/skin-green.min.css # public/css/dist/skins/skin-orange.css # public/css/dist/skins/skin-orange.min.css # public/css/dist/skins/skin-purple.css # public/css/dist/skins/skin-purple.min.css # public/css/dist/skins/skin-red.css # public/css/dist/skins/skin-red.min.css # public/css/dist/skins/skin-yellow.css # public/css/dist/skins/skin-yellow.min.css # public/mix-manifest.json		2022-05-18 17:21:32 -07:00
..
css	Merge remote-tracking branch 'origin/develop'	2022-05-18 17:21:32 -07:00
img	Added userpics from thispersondoesnotexist.com	2021-09-23 22:05:42 -07:00
js	Merge remote-tracking branch 'origin/develop'	2022-05-18 13:37:31 -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	Merge master down into develop	2021-12-16 14:26:24 -08: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'	2022-05-18 17:21:32 -07:00
mix.js.map	Added resources	2020-04-22 07:15:24 -07:00
robots.txt	Disallow / in robots	2017-09-28 17:47:48 -07:00
web.config	Fix for IIS+ Chrome not showing webfonts	2017-11-06 16:51:46 -08:00