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

Conflicts: include/onepoll.php
2017-03-12 20:54:28 +00:00
parent 60adf67f13 7d1e54664a
commit 1624150db4
27 changed files with 13447 additions and 13110 deletions
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php

-define('UPDATE_VERSION' , 1214);
+define('UPDATE_VERSION' , 1215);

 /**
 *