Mirrors/ICEcoder
2
0
Fork 0
mirror of https://github.com/icecoder/ICEcoder.git synced 2026-03-11 19:16:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'temp'

Browse Source 
Conflicts:
	lib/settings.php

Fixing stupid Github problems
This commit is contained in:
Matt Pass
2012-09-19 09:42:57 +01:00
parent 158e03b5fd 021a217f2c
commit ed0bad79ad
11 changed files with 116 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/settings.php
View File

@@ -29,7 +29,7 @@ include($settingsFile);
// Add ICEcoder settings to beginning of $ICEcoder array
$ICEcoder = array(
"versionNo" => "0.8.4",
"versionNo" => "0.8.5",
"codeMirrorDir" => "CodeMirror-2.33",
"cMThisVer" => 2.33
)+$ICEcoder;