diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-01-02 00:11:41 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-01-02 00:11:41 -0600 |
| commit | 54148b9a4a044e2c3ac9bb5eed71edcc0d598907 (patch) | |
| tree | 09cc3cd0558f0152ff17b0c48acbf346b8006098 /app/javascript/styles/application.scss | |
| parent | fa9b7ece2e521fb4d6b91a95028614ae9b2a58a3 (diff) | |
| parent | 764f87695358c06a823a9c9541f2e8fb092de299 (diff) | |
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts: app/controllers/authorize_follows_controller.rb app/javascript/styles/mastodon/components.scss
Diffstat (limited to 'app/javascript/styles/application.scss')
| -rw-r--r-- | app/javascript/styles/application.scss | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/javascript/styles/application.scss b/app/javascript/styles/application.scss index 44aa10564..fd6665f65 100644 --- a/app/javascript/styles/application.scss +++ b/app/javascript/styles/application.scss @@ -6,6 +6,7 @@ @import 'mastodon/reset'; @import 'mastodon/basics'; +@import 'mastodon/modal'; @import 'mastodon/containers'; @import 'mastodon/lists'; @import 'mastodon/footer'; |