diff options
author | David Yip <yipdw@member.fsf.org> | 2018-03-27 10:26:47 -0500 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-03-27 10:26:47 -0500 |
commit | f61aa8e0f7101b5b7510a3809c94b7083ba08329 (patch) | |
tree | 3677a21fdbd4174125495e3545c527e8aff47297 /app/models/application_record.rb | |
parent | 6af17b79c57b95a39fb4ed325aeff3edf02162ea (diff) | |
parent | 40e5d2303ba1edc51beae66cc15263675980106a (diff) |
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: app/javascript/styles/mastodon/components.scss app/models/media_attachment.rb
Diffstat (limited to 'app/models/application_record.rb')
-rw-r--r-- | app/models/application_record.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/application_record.rb b/app/models/application_record.rb index 71fbba5b3..83134d41a 100644 --- a/app/models/application_record.rb +++ b/app/models/application_record.rb @@ -2,4 +2,5 @@ class ApplicationRecord < ActiveRecord::Base self.abstract_class = true + include Remotable end |