Merge remote-tracking branch 'upstream/develop' into develop

This commit is contained in:
Michael Vogel 2016-08-01 08:02:26 +02:00
commit 02b5f6a34d
28 changed files with 1129 additions and 1192 deletions

View file

@ -1,6 +1,6 @@
<?php
define('UPDATE_VERSION' , 1199);
define('UPDATE_VERSION' , 1200);
/**
*