diff options
| author | friendica <info@friendica.com> | 2014-05-29 16:14:10 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-05-29 16:14:10 -0700 |
| commit | 9b5eabf1083602382385c62c6ad7d8ae8e167f9e (patch) | |
| tree | a73ed07970a517dbad90f14954fea790193813c3 /doc/Comanche.md | |
| parent | a00103b7dfa0b128cbe6ab03e6a43ccedb24f8c2 (diff) | |
| parent | 1a58777daa0ab9394f38737a806a7a185ebceeb0 (diff) | |
| download | volse-hubzilla-9b5eabf1083602382385c62c6ad7d8ae8e167f9e.tar.gz volse-hubzilla-9b5eabf1083602382385c62c6ad7d8ae8e167f9e.tar.bz2 volse-hubzilla-9b5eabf1083602382385c62c6ad7d8ae8e167f9e.zip | |
Merge branch 'master' into newevent
Conflicts:
include/zot.php
Diffstat (limited to 'doc/Comanche.md')
| -rw-r--r-- | doc/Comanche.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/Comanche.md b/doc/Comanche.md index fe122db8c..7374e8406 100644 --- a/doc/Comanche.md +++ b/doc/Comanche.md @@ -24,6 +24,7 @@ Currently there are three layout templates, unless your site provides additional The choklet template provides a number of fluid layout styles which can be specified by flavour: (default flavour) - a two column layout similar to the "default" template, but more fluid + bannertwo - a two column layout with a banner region, compatible with the "default" template on small displays three - three column layout (adds a "right_aside" region to the default template) edgestwo - two column layout with fixed side margins edgesthree - three column layout with fixed side margins |