Merge branch 'master' into feature/hostingpackages

* master:
  load Font Mfizz in base template head
  add userdb template tags
  add Font Mfizz from http://mfizz.com/oss/font-mfizz

merged docs/changelog.rst
This commit is contained in:
Jan Dittberner 2015-01-18 16:24:53 +01:00
commit 30aa09c0af
12 changed files with 1736 additions and 6 deletions

View file

@ -23,8 +23,14 @@
.. automodule:: userdbs.models
:members:
:py:mod:`templatetags <userdbs.templatetags>`
---------------------------------------------
:py:mod:`views <userdbs.views>`
-------------------------------
.. automodule:: userdbs.templatetags
.. automodule:: userdbs.views
:py:mod:`userdb <userdbs.templatetags.userdb>`
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. automodule:: userdbs.templatetags.userdb
:members: