Thibaut Girka 45709d6987 Merge branch 'master' into glitch-soc/master ... Conflicts: - `README.md`: We have different README files. Discarded upstream changes. - `app/views/layouts/admin.html.haml`: Conflict due to glitch-soc theming system. Adapted upstream changes. - `app/views/layouts/embedded.html.haml`: Conflict due to glitch-soc theming system. Adapted upstream changes. - `yarn.lock`: No real conflict, glitch-specific dependency too close to an updated one. Adapted upstream change.		2020-01-20 15:00:22 +01:00
..
chewy
controllers	Merge branch 'master' into glitch-soc/master	2020-01-20 15:00:22 +01:00
helpers	Merge branch 'master' into glitch-soc/master	2020-01-20 15:00:22 +01:00
javascript	Merge branch 'master' into glitch-soc/master	2020-01-20 15:00:22 +01:00
lib	Merge branch 'master' into glitch-soc/master	2020-01-20 15:00:22 +01:00
mailers
middleware
models
policies
presenters
serializers
services
validators
views	Merge branch 'master' into glitch-soc/master	2020-01-20 15:00:22 +01:00
workers