52 Commits (2ddcaa9ce12c1a8d7108f2a5a8924963f0fd8874)

Author	SHA1	Message	Date
Julian Lam	55b67ed735	Merge branch 'master' of github.com:designcreateplay/NodeBB ... Conflicts: src/routes/api.js	11 years ago
Julian Lam	0376e3d574	renamed language directories to ICU standard, upgrade script, no longer promoting english at top of list in languages tab, en now en_GB, encompasses Canadian and English English	11 years ago