Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse source 
Conflicts:
	app/javascript/mastodon/initial_state.js
	db/schema.rb

Upstream added a new field to initial_state.
Not too sure about what happened with db/schema.rb though…
This commit is contained in:
Thibaut Girka 2018-06-15 20:51:39 +02:00
commit db200226b8
32 changed files with 245 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/javascript/mastodon/initial_state.js
View file

@ -12,5 +12,6 @@ export const deleteModal = getMeta('delete_modal');
export const me = getMeta('me');
export const searchEnabled = getMeta('search_enabled');
export const maxChars = getMeta('max_toot_chars') || 500;
export const invitesEnabled = getMeta('invites_enabled');
export default initialState;