mirror/php-monstra
1
0
Fork 0
mirror of https://github.com/monstra-cms/monstra.git synced 2025-08-09 06:37:01 +02:00
Code Issues Releases Wiki Activity

Merge branch 'origin/dev'

Browse Source 
Conflicts:
	engine/Monstra.php
	public/assets/js/bootstrap.js
This commit is contained in:
Awilum
2014-01-01 21:32:20 +02:00
parent 83f80306d3 cd0d8296a5
commit 5ea80e31e0
20 changed files with 5290 additions and 3342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
engine/Monstra.php
View File

@@ -39,7 +39,11 @@ class Monstra
/**
* The version of Monstra
*/
<<<<<<< HEAD
const VERSION = '2.4.0 pre-alpha';
=======
const VERSION = '2.3.1';
>>>>>>> refs/remotes/origin/dev
/**
* Monstra environment