Unfloyded/Legamunt
0
0
Fork 0
Code Activity

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

Browse source 
Conflicts:
- Gemfile
- Gemfile.lock
- app/controllers/about_controller.rb
- app/controllers/auth/sessions_controller.rb
This commit is contained in:
Thibaut Girka 2019-09-30 12:23:57 +02:00
commit 16ff7c5627
352 changed files with 7151 additions and 2269 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/remote_interaction_controller.rb
View file

@ -11,6 +11,8 @@ class RemoteInteractionController < ApplicationController
before_action :set_body_classes
before_action :set_pack
skip_before_action :require_functional!
def new
@remote_follow = RemoteFollow.new(session_params)
end