Thibaut Girka 76918554a6 Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile.lock - config/webpack/rules/css.js - package.json - yarn.lock		2019-06-03 14:54:30 +02:00
..
chewy	…
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-28 17:45:06 +02:00
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-28 17:45:06 +02:00
javascript	Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream	2019-06-03 14:54:30 +02:00
lib	Truncate long URLs while providing alt text for inline images	2019-05-28 19:33:43 +02:00
mailers	…
models	Added env variables for max image and video size.	2019-06-02 14:38:13 +02:00
policies	…
presenters	…
serializers	Raise exception when attempting to serialize local-only statuses	2019-05-30 09:04:12 +02:00
services	…
validators	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-19 21:53:44 +02:00
views	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-28 17:45:06 +02:00
workers	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-23 19:01:30 +02:00