1
0
Fork 0

Merge remote-tracking branch 'upstream/develop' into 1702-null-date

Conflicts:
	include/onepoll.php
This commit is contained in:
Michael 2017-03-12 20:54:28 +00:00
commit 1624150db4
27 changed files with 13447 additions and 13110 deletions

View file

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