harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/redmatrix/redmatrix into pending_merge

Browse Source 
Conflicts:
	install/update.php
This commit is contained in:
redmatrix 2015-09-23 22:33:48 -07:00
commit e04f04ef0f
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
install/update.php
View File

@ -1873,4 +1873,5 @@ function update_r1154() {
return UPDATE_SUCCESS; return UPDATE_SUCCESS;
return UPDATE_FAILED; return UPDATE_FAILED;
} }

2
version.inc
View File

@ -1 +1 @@
2015-09-22.1163 2015-09-23.1164