4 Commits

Author	SHA1	Message	Date
Thibaut Girka	9abb227250	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Our README.md files are completely different. Discarded upstream changes. - `app/javascript/core/admin.js`: Updating rails-ujs, no real conflict, but a comment to close to changed code. Various glitch-soc-only files have been updated to match those changes, though. - `package.json`: No real conflict, just an additional dependency in glitch-soc that was too close to something updated upstream. Took upstream's changes.	2020-03-22 16:10:44 +01:00
Thibaut Girka	bcf157a1a9	Avoid loading rails-ujs twice on vanilla flavour	2018-07-16 16:42:52 +02:00
kibigo!	bdca1614d5	Screenshot support for themes	2017-12-10 20:32:28 -08:00
kibigo!	bc4fa6b198	Rename themes -> flavours ? ?	2017-12-03 23:26:40 -08:00