Merge branch 'master' of https://github.com/thelia/thelia into coupon

Browse Source

# By mespeche
# Via mespeche
* 'master' of https://github.com/thelia/thelia:
  WIP : Comment of route url-rewriting.check
  Working : Fix script reset
  Working : Cleanup admin new version bootstrap v3
  Working : Finish renaming class for bootstrap migration
  Working : Major class changes migration from bootstrap 2.x to 3.0

Conflicts:
	reset_install.sh
	templates/admin/default/assets/css/admin.less

...

This commit is contained in:

gmorel

2013-09-04 16:11:51 +02:00

parent a461420c67 ba645764fc

commit 0ea7beb70f

96 changed files with 10440 additions and 10917 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1999

templates/admin/default/assets/js/bootstrap/bootstrap.js vendored Normal file

File diff suppressed because it is too large Load Diff