Thibaut Girka e5a603206d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/accounts_controller.rb app/javascript/mastodon/locales/pl.json app/views/about/more.html.haml Conflicts in `accounts_controller.rb` resolved by taking upstream's version + our `use_pack`. Conflicts in `pl.json` resolved by taking upstream's changes. Conflicts in `aboute/more.html.haml` resolved by taking upstream's changes.		2018-08-10 16:22:31 +02:00
..
admin	…
concerns	…
form	…
web	…
account_domain_block_spec.rb	…
account_filter_spec.rb	…
account_moderation_note_spec.rb	…
account_pin_spec.rb	Public profile endorsements (accounts picked by profile owner) (#8146)	2018-08-09 09:56:53 +02:00
account_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-01 00:18:13 +02:00
backup_spec.rb	…
block_spec.rb	…
conversation_mute_spec.rb	…
conversation_spec.rb	…
custom_emoji_spec.rb	…
custom_filter_spec.rb	Keyword/phrase filtering (#7905)	2018-06-29 15:34:36 +02:00
domain_block_spec.rb	…
email_domain_block_spec.rb	…
export_spec.rb	…
favourite_spec.rb	…
follow_request_spec.rb	…
follow_spec.rb	…
home_feed_spec.rb	…
identity_spec.rb	…
import_spec.rb	…
invite_spec.rb	…
list_account_spec.rb	…
list_spec.rb	…
media_attachment_spec.rb	Resize images by area instead of fixed dimensions (#8083)	2018-07-28 03:33:00 +02:00
mention_spec.rb	…
mute_spec.rb	…
notification_spec.rb	…
preview_card_spec.rb	…
relay_spec.rb	Add federation relay support (#7998)	2018-07-13 02:16:06 +02:00
remote_follow_spec.rb	…
remote_profile_spec.rb	…
report_filter_spec.rb	…
report_spec.rb	…
session_activation_spec.rb	…
setting_spec.rb	…
site_upload_spec.rb	…
status_pin_spec.rb	…
status_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-06-21 20:49:57 +02:00
stream_entry_spec.rb	…
subscription_spec.rb	…
tag_spec.rb	…
user_spec.rb	…