]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge pull request #7579 from owncloud/introduce-generateUrl-master
authorMorris Jobke <morris.jobke@gmail.com>
Thu, 6 Mar 2014 14:07:28 +0000 (15:07 +0100)
committerMorris Jobke <morris.jobke@gmail.com>
Thu, 6 Mar 2014 14:07:28 +0000 (15:07 +0100)
Introduce OC.generateUrl() in master

1  2 
core/js/js.js
core/js/tests/specs/coreSpec.js

diff --cc core/js/js.js
Simple merge
Simple merge