You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Julian Lam ad723e2943 Merge branch 'master' into categories_revamp
Conflicts:
	src/views/admin/partials/menu.tpl
10 years ago
..
images fixed ACP background image on subfolder installs 10 years ago
language shorter language string for composer guest handle placeholder, #2569 10 years ago
less drag/drop re-ordering fixed in ACP, #2463 10 years ago
src Merge branch 'master' into categories_revamp 10 years ago
uploads gitignore and folders 10 years ago
vendor
favicon.ico
logo.png