snipe 33e92c975a Merge remote-tracking branch 'origin/develop' ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # 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-yellow-dark.css # public/css/dist/skins/skin-yellow-dark.min.css # public/js/build/app.js # public/js/dist/all.js # public/mix-manifest.json		2021-07-15 13:29:00 -07:00
..
assets	Make non linked striped text the same for [ch16602]	2021-07-14 14:50:45 -07:00
lang	Allow password reset from user profile	2021-05-26 15:32:23 -07:00
macros	Add a way for a user to override the site skin setting + fix mislabeled comment. (#6891)	2021-03-29 19:09:23 -07:00
views	Merge remote-tracking branch 'origin/develop'	2021-07-08 17:47:08 -07:00