Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Merge remote-tracking branch 'origin/master' into merge-upstream

Browse source 
Conflicts:
	.env.production.sample
	app/controllers/auth/confirmations_controller.rb
	db/schema.rb
This commit is contained in:
David Yip 2018-02-04 16:36:19 -06:00
commit a6fb1c58ee
No known key found for this signature in database
GPG key ID: 7DA0036508FCC0CC
35 changed files with 506 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/about_controller.rb
View file

@ -36,7 +36,7 @@ class AboutController < ApplicationController
def initial_state_params
{
settings: {},
settings: { known_fediverse: Setting.show_known_fediverse_at_about_page },
token: current_session&.token,
}
end