mastodon/app/helpers
Thibaut Girka f8e07ca5cd Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/status.rb

Resolved by taking both changes (not a real conflict, just changes too close
to each other).
2018-11-27 13:23:02 +01:00
..
admin Redesign admin accounts index (#9340) 2018-11-26 15:53:27 +01:00
settings
application_helper.rb
flashes_helper.rb
home_helper.rb
instance_helper.rb
jsonld_helper.rb
mailer_helper.rb
routing_helper.rb
settings_helper.rb
stream_entries_helper.rb Redesign admin accounts index (#9340) 2018-11-26 15:53:27 +01:00