Skip to content

Commit d513864

Browse files
jlasojlaso
committedMar 31, 2015
Merge branch 'develop'
Conflicts: .gitignore composer.json
·
1.5
2 parents 6e18a6c + 06e7358 commit d513864

File tree

517 files changed

+86868
-20717
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

517 files changed

+86868
-20717
lines changed
 

‎.gitignore

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
.vagrant
22
.idea
33
.DS_Store
4+
_doc
45
app/config/dbconfig.php
6+
app/config/parameters.yml
7+
app/config/orm.yml
58
MAMP_php_error_log_MAMP
69
app/cache/*
710
app/logs/*
811
web/custom/*
912
templates/custom/*
13+
vendor/*
14+
vendor
1015
composer.lock
11-

‎.gitmodules

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[submodule "adminlte"]
2+
path = web/custom/adminlte
3+
url = https://github.com/almasaeed2010/AdminLTE.git
4+
branch = master

0 commit comments

Comments
 (0)