13 Commits (f3deef4931a30d49b753e84d6fa2cc5c705188d6)

Author	SHA1	Message	Date
Peter Jaszkowiak	484a800327	Merge branch master into develop	8 years ago
psychobunny	53dac97800	closes #5560	8 years ago
Julian Lam	d75cc60e76	added upgrade.check back into upgrade.js	8 years ago
Peter Jaszkowiak	23540afaeb	Resolve merge conflicts	8 years ago
Barış Soner Uşaklı	1b43faba1a	closes #5441	8 years ago
Peter Jaszkowiak	1493afee2a	ESlint indent	8 years ago
Peter Jaszkowiak	604358ecc4	ESlint keyword-spacing, no-multi-spaces	8 years ago
Peter Jaszkowiak	bc1d70c126	ESlint comma-dangle	8 years ago
Peter Jaszkowiak	aaacdb8413	Fix #5416, uploads path config setting ... - Finish moving uploads route to `/assets/uploads` - Remove `upload_url` config setting, it was broken	8 years ago
Dominic Lennon	04e5707143	Fixing lint issues	8 years ago
Dominic Lennon	d248ef95cd	Fix for issue #5334. SessionStore now uses the correct value	8 years ago
barisusakli	c927eb15d7	fix requires	8 years ago
barisusakli	c36e2aa13d	refactor app.js/start	8 years ago