Ondřej Hruška 3ea02314b9 split added glitch locales from vanilla (#82) ... * Locale script now accepts overrides and new keys from glitch/locales * Revert glitchsoc changes to mastodon/locales to prevent future merge conflicts		2017-07-16 01:15:25 +02:00
..
controllers	Merge upstream (#81)	2017-07-15 14:33:15 -07:00
helpers	Improve ActivityPub representations (#3844)	2017-07-15 03:01:39 +02:00
javascript	split added glitch locales from vanilla (#82)	2017-07-16 01:15:25 +02:00
lib	Merge upstream (#81)	2017-07-15 14:33:15 -07:00
mailers	Set default From address in config (#3756)	2017-07-07 00:12:12 +02:00
models	Merge upstream (#81)	2017-07-15 14:33:15 -07:00
policies	Add status destroy authorization to policy (#3453)	2017-05-30 22:56:31 +02:00
presenters	Merge upstream (#81)	2017-07-15 14:33:15 -07:00
serializers	Improve ActivityPub representations (#3844)	2017-07-15 03:01:39 +02:00
services	Merge upstream (#81)	2017-07-15 14:33:15 -07:00
validators	All cybrespace changes through 5/28	2017-06-23 21:45:14 +00:00
views	Merge upstream (#81)	2017-07-15 14:33:15 -07:00
workers	Optimize uri normalization (#4212)	2017-07-15 17:24:35 +02:00