FreakU
/
mastodon
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/controllers/api/v1
History
David Yip eb39db7f93
Merge remote-tracking branch 'origin/master' into gs-master 
Conflicts:
 	app/javascript/mastodon/locales/en.json
 	app/javascript/mastodon/locales/ja.json
 	app/javascript/mastodon/locales/pl.json
 	app/views/accounts/_header.html.haml
 		2018-04-01 20:24:50 -05:00
..
accounts Fix unpermitted parameters warning when generating pagination URLs (#6995) 2018-04-02 02:09:50 +02:00
apps
…
instances
…
lists
…
statuses
…
timelines Merge remote-tracking branch 'origin/master' into gs-master 2018-04-01 20:24:50 -05:00
accounts_controller.rb
…
apps_controller.rb
…
blocks_controller.rb
…
custom_emojis_controller.rb
…
domain_blocks_controller.rb
…
favourites_controller.rb
…
follow_requests_controller.rb
…
follows_controller.rb
…
instances_controller.rb
…
lists_controller.rb
…
media_controller.rb
…
mutes_controller.rb Merge remote-tracking branch 'origin/master' into gs-master 2018-04-01 20:24:50 -05:00
notifications_controller.rb Merge remote-tracking branch 'origin/master' into gs-master 2018-04-01 20:24:50 -05:00
reports_controller.rb
…
search_controller.rb
…
statuses_controller.rb
…
streaming_controller.rb
…