Commit b34387c

Tortue Torche

committed

Merge branch '2.0' into 2.1

# Conflicts: # .travis.yml # composer.json

2 parents 715e0cf + e959d29 commit b34387cCopy full SHA for b34387c

7 files changed

+5362

-3999

lines changed

provider/assets/js

7 files changed

+5362

-3999

lines changed

Comments

(0)