[Pkg-owncloud-commits] [owncloud] 27/62: Merge pull request #16822 from owncloud/stable8-backport-16818

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag v8.0.5beta
in repository owncloud.

commit 1754c9a9890ecdd94a691167f29b3f0b315689d3
Merge: 2c118c3 8cd359a
Author: Joas Schilling <nickvergessen at gmx.de>
Date:   Tue Jun 9 16:50:54 2015 +0200

    Merge pull request #16822 from owncloud/stable8-backport-16818
    
    [stable8] Upgrade jquery-migrate to 1.2.1

 bower.json                                         |    1 +
 core/js/core.json                                  |    2 +-
 core/vendor/.gitignore                             |    2 +-
 core/vendor/jquery-migrate/.bower.json             |   15 +
 core/vendor/jquery-migrate/component.json          |    4 +
 .../{jquery => jquery-migrate}/jquery-migrate.js   | 1032 ++++++++++----------
 core/vendor/jquery-migrate/jquery-migrate.min.js   |    2 +
 core/vendor/jquery/jquery-migrate.min.js           |    3 -
 8 files changed, 545 insertions(+), 516 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git