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

Merge fixes

Browse Source
This commit is contained in:
Awilum
2014-01-01 21:35:04 +02:00
parent 5ea80e31e0
commit 8cacd03c40
2 changed files with 1 additions and 2284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
engine/Monstra.php
View File

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

2280
public/assets/js/bootstrap.js vendored
View File

File diff suppressed because it is too large Load Diff