Merge branch 'master' into task/3843/generic_ungleich_cms_template

This commit is contained in:
PCoder 2017-11-26 21:19:52 +01:00
commit cb198313e7

View file

@ -1,6 +1,8 @@
ungleich ungleich
======== ========
[![Build Status](https://travis-ci.org/ungleich/dynamicweb.svg?branch=master)](https://travis-ci.org/ungleich/dynamicweb)
dynamicweb dynamicweb
---------- ----------
Website for ungleich GmbH Website for ungleich GmbH