luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-04 20:45:13 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/spec/views/about
History
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
..
show.html.haml_spec.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-08-01 22:20:25 +02:00