Merge branch 'develop' of github.com:martini/zammad into develop

This commit is contained in:
Martin Edenhofer 2015-04-05 00:23:24 +02:00
commit 48c6b963fa

View file

@ -1,4 +1,5 @@
[![Build Status](http://ci.zammad.org/buildStatus/icon?job=Zammad Unittest Develop)](http://ci.zammad.org/job/Zammad Unittest Develop/)
[![Build Status](http://ci.zammad.org/buildStatus/icon?job=Zammad Unittest Develop (MySQL))](http://ci.zammad.org/job/Zammad%20Unittest%20Develop%20(MySQL)/)
[![Build Status](http://ci.zammad.org/buildStatus/icon?job=Zammad Unittest Develop (MariaDB Cluster))](http://ci.zammad.org/job/Zammad%20Unittest%20Develop%20(MariaDB%20Cluster)/)
Welcome to Zammad
=================