Ondřej Hruška 7072288bcf Merge git://github.com/tootsuite/mastodon into tootsuite-master		2017-07-25 21:36:22 +02:00
..
controllers	Merge git://github.com/tootsuite/mastodon into tootsuite-master	2017-07-25 21:36:22 +02:00
helpers	Use the same emoji data on the frontend and backend (#4284)	2017-07-21 04:27:40 +02:00
javascript	Merge git://github.com/tootsuite/mastodon into tootsuite-master	2017-07-25 21:36:22 +02:00
lib	Merge that good fresh upstream shit	2017-07-22 01:16:53 +00:00
mailers	Set default From address in config (#3756)	2017-07-07 00:12:12 +02:00
models	Merge git://github.com/tootsuite/mastodon into tootsuite-master	2017-07-25 21:36:22 +02: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 git://github.com/tootsuite/mastodon into tootsuite-master	2017-07-25 21:36:22 +02:00
validators	All cybrespace changes through 5/28	2017-06-23 21:45:14 +00:00
views	Merge git://github.com/tootsuite/mastodon into tootsuite-master	2017-07-25 21:36:22 +02:00
workers	Move clean up of unconfirmed users to sidekiq-scheduler (#4336)	2017-07-24 16:17:55 +02:00