tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master

Browse Source
This commit is contained in:
David Yip committed 2018-01-07 13:30:52 -06:00
2 parents 70c99a9f34 c2e1bfd9ae
commit f7c4d4464b
10 files changed
+73 -22
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/controllers/application_controller.rb
+1 -1
View File
@@ -31,7 +31,7 @@ class ApplicationController < ActionController::Base
private
def https_enabled?
Rails.env.production? && ENV['LOCAL_HTTPS'] == 'true'
Rails.env.production?
end
def store_current_location