snipe 77ec64aded Merge remote-tracking branch 'origin/develop' ... # Conflicts: # 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-purple-dark.css # public/css/dist/skins/skin-purple-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		2021-03-02 12:33:18 -08:00
..
css	Merge remote-tracking branch 'origin/develop'	2021-03-02 12:33:18 -08:00
img	Added other logo for demo	2021-01-27 00:35:32 -08:00
js	Merge remote-tracking branch 'origin/develop'	2021-03-02 12:33:18 -08:00
uploads	Fixed logo uploads	2020-04-27 23:22:52 -07:00
.htaccess	Port/reenable most unit tests. (#5921)	2018-07-23 06:48:21 -07:00
favicon.ico	Default favicon	2020-02-11 20:19:24 -08:00
index.php	Updated email addy	2016-12-14 04:38:03 -08:00
mix-manifest.json	Merge remote-tracking branch 'origin/develop'	2021-03-02 12:33:18 -08: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