Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Merge branch 'master' into glitch-soc/merge

Browse source 
Conflicts:
	app/controllers/invites_controller.rb
	app/serializers/initial_state_serializer.rb
	config/locales/ko.yml
This commit is contained in:
Thibaut Girka 2018-05-11 18:12:42 +02:00
commit 45fce0e496
110 changed files with 1476 additions and 388 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/application_controller.rb
View file

@ -9,6 +9,7 @@ class ApplicationController < ActionController::Base
include Localized
include UserTrackingConcern
include SessionTrackingConcern
helper_method :current_account
helper_method :current_session