beatrix e7edb4d1ee Merge pull request #87 from tootsuite/master ... merge upstream		2017-07-20 11:24:32 -04:00
..
controllers	Merge pull request #87 from tootsuite/master	2017-07-20 11:24:32 -04:00
helpers	Fix deprecation warning for non-pipeline assets (#4267)	2017-07-19 12:00:05 +02:00
javascript	Merge pull request #87 from tootsuite/master	2017-07-20 11:24:32 -04:00
lib	Merge pull request #87 from tootsuite/master	2017-07-20 11:24:32 -04:00
mailers	Set default From address in config (#3756)	2017-07-07 00:12:12 +02:00
models	Merge pull request #87 from tootsuite/master	2017-07-20 11:24:32 -04:00
policies	Add status destroy authorization to policy (#3453)	2017-05-30 22:56:31 +02:00
presenters	Updated from tootsuite	2017-07-17 20:03:57 +02:00
serializers	Add unfollow modal (optional) (#4246)	2017-07-18 17:14:43 +02:00
services	Merge pull request #87 from tootsuite/master	2017-07-20 11:24:32 -04:00
validators	All cybrespace changes through 5/28	2017-06-23 21:45:14 +00:00
views	Merge pull request #87 from tootsuite/master	2017-07-20 11:24:32 -04:00
workers	Fix webfinger retries (#4275)	2017-07-20 01:59:07 +02:00