Age | Commit message (Collapse) | Author |
|
|
|
# Conflicts:
# public/css/theme0.css
# public/css/theme1.css
# public/css/theme2.css
# public/css/theme3.css
# public/css/theme4.css
# public/css/theme5.css
# public/css/theme6.css
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
address on every page
|
|
|
|
|
|
|
|
|
|
|
|
|
|
fixes #168
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- syntax error in index.php
- switched from sass to less because of bootstrap submodule
|
|
|
|
|
|
Conflicts:
templates/layout.html
|
|
|
|
|
|
Conflicts:
themes/theme1.scss
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|