Merge remote-tracking branch 'upstream/develop' into 1702-null-date
Conflicts: include/onepoll.php
This commit is contained in:
commit
1624150db4
27 changed files with 13447 additions and 13110 deletions
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
define('UPDATE_VERSION' , 1214);
|
||||
define('UPDATE_VERSION' , 1215);
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue