Thibaut Girka 6f75a9001f Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/stream_entries/_simple_status.html.haml - config/locales/nl.yml Deleted unused translation strings (themes) and adapted minor changes to _simple_status.html.haml		2018-08-31 19:10:57 +02:00
..
admin
concerns	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-31 19:10:57 +02:00
form
web	Fix has_one association on Web::PushSubscription (#7767)	2018-06-09 21:11:14 +02:00
account.rb
account_domain_block.rb
account_filter.rb
account_moderation_note.rb
account_pin.rb
admin.rb
application_record.rb
backup.rb	Update dependencies for Ruby (2018-04-23) (#7237)	2018-04-23 11:29:17 +02:00
block.rb
bookmark.rb
context.rb	Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)	2017-07-07 04:02:06 +02:00
conversation.rb
conversation_mute.rb
custom_emoji.rb
custom_emoji_filter.rb
custom_filter.rb
domain_block.rb
email_domain_block.rb
export.rb	Show exact number of followers/statuses on export page/in tooltip (#8199)	2018-08-14 21:56:17 +02:00
favourite.rb
feed.rb
follow.rb
follow_request.rb
home_feed.rb
identity.rb
import.rb
instance.rb
instance_filter.rb
invite.rb
invite_filter.rb
list.rb
list_account.rb	Update dependencies for Ruby (2018-04-23) (#7237)	2018-04-23 11:29:17 +02:00
list_feed.rb
media_attachment.rb
mention.rb
mute.rb	Merge remote-tracking branch 'origin/master' into gs-master	2018-05-03 17:23:44 -05:00
notification.rb
preview_card.rb
relay.rb	Expect relays to answer with accept/reject (#8179)	2018-08-13 18:17:20 +02:00
remote_follow.rb
remote_profile.rb
report.rb	Update dependencies for Ruby (2018-04-23) (#7237)	2018-04-23 11:29:17 +02:00
report_filter.rb
report_note.rb
search.rb
session_activation.rb
setting.rb	Update dependencies for Ruby (2018-04-23) (#7237)	2018-04-23 11:29:17 +02:00
site_upload.rb
status.rb
status_pin.rb
status_stat.rb
stream_entry.rb
subscription.rb
tag.rb
trending_tags.rb
user.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-27 18:09:28 +02:00
web.rb