diff options
| author | Ian Lewis <ianmlewis@gmail.com> | 2020-08-17 21:44:31 -0400 |
|---|---|---|
| committer | Ian Lewis <ianmlewis@gmail.com> | 2020-08-17 21:44:31 -0400 |
| commit | ac324f646ee3cb7955b0b45a7453aeb9671cbdf1 (patch) | |
| tree | 0cbc5018e8807421d701d190dc20525726c7ca76 /website/css/main.scss | |
| parent | 352ae1022ce19de28fc72e034cc469872ad79d06 (diff) | |
| parent | 6d0c5803d557d453f15ac6f683697eeb46dab680 (diff) | |
Merge branch 'master' into ip-forwarding
- Merges aleksej-paschenko's with HEAD
- Adds vfs2 support for ip_forward
Diffstat (limited to 'website/css/main.scss')
| -rw-r--r-- | website/css/main.scss | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/website/css/main.scss b/website/css/main.scss new file mode 100644 index 000000000..06106833f --- /dev/null +++ b/website/css/main.scss @@ -0,0 +1,5 @@ +@import 'style.scss'; +@import 'front.scss'; +@import 'navbar.scss'; +@import 'sidebar.scss'; +@import 'footer.scss'; |