about summary refs log tree commit diff
path: root/spec/models/import_spec.rb
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-08-10 15:39:06 +0200
committerThibaut Girka <thib@sitedethib.com>2018-08-10 16:22:31 +0200
commite5a603206dfa76e2cd1b8a7fbb940fbd844b436c (patch)
treec3271f86b91ce2d13aea4f111dad6da4d07dcc04 /spec/models/import_spec.rb
parent90b492143dae5cbaf884b12fbfd823c9f65d392f (diff)
parent5b8603879f06573d51c5c33edda6f410d1af7a02 (diff)
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.
Diffstat (limited to 'spec/models/import_spec.rb')
0 files changed, 0 insertions, 0 deletions