diff options
author | Ondřej Hruška <ondra@ondrovo.com> | 2017-09-28 09:20:59 +0200 |
---|---|---|
committer | Ondřej Hruška <ondra@ondrovo.com> | 2017-09-28 09:20:59 +0200 |
commit | daad07b1d552d5af06b4d8443afdbe1350785a14 (patch) | |
tree | 4062f211cd6e307a5bbb7c338263f366a9fafade /app/javascript/styles | |
parent | 83bda6c1a813c5aeb131b18a0500fed0c07fa9c2 (diff) | |
parent | f7ca205f382a9d528bf37e3ec38ee8bf77dccccf (diff) |
Merge remote-tracking branch 'origin/better-themeing' into merging-upstream
Diffstat (limited to 'app/javascript/styles')
-rw-r--r-- | app/javascript/styles/custom.scss | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/javascript/styles/custom.scss b/app/javascript/styles/custom.scss deleted file mode 100644 index 97a981243..000000000 --- a/app/javascript/styles/custom.scss +++ /dev/null @@ -1 +0,0 @@ -@import 'application'; |