mirror/php-monstra
1
0
Fork 0
mirror of https://github.com/monstra-cms/monstra.git synced 2025-08-16 01:54:44 +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

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

File diff suppressed because it is too large Load Diff

2
public/themes/default/footer.chunk.php
View File

@@ -1,8 +1,6 @@
<footer>
<p>
<div style="float:left;"><?php echo Chunk::get('footer-links'); ?></div>
<div style="float:right;"><?php Action::run('theme_footer'); ?><?php echo Site::powered(); ?></div>
</p>
</footer>
</div> <!-- /container -->

2
public/themes/default/index.template.php
View File

@@ -20,4 +20,4 @@
</div>
<hr>
<?php Chunk::get('footer');
<?php Chunk::get('footer'); ?>