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

Browse Source

* 'coupon' of https://github.com/thelia/thelia:

# By Manuel Raynaud
# Via Manuel Raynaud
* 'master' of https://github.com/thelia/thelia:
  allow to delete content
  toofle content visibility
  allow to load jquery offline
  allow update content position number

...

This commit is contained in:

gmorel

2013-09-25 16:40:54 +02:00

parent b7851b2d54 1e571ffbc5

commit c10074786d

10 changed files with 248 additions and 6 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

6

templates/admin/default/assets/js/libs/jquery.js vendored Normal file

File diff suppressed because one or more lines are too long