lxm_front/Mergely
1
0
Fork 1
mirror of synced 2025-12-09 15:28:12 +08:00
Code Issues Projects Releases Wiki Activity

Fixed no-conflict jQuery

Browse Source
This commit is contained in:
Jamie Peabody
2016-09-07 19:06:47 +01:00
parent 627b113802
commit 1279be2745
4 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bower.json
View File

@@ -1,6 +1,6 @@
{
"name": "Mergely",
"version": "3.4.2",
"version": "3.4.3",
"homepage": "https://github.com/wickedest/Mergely",
"description": "Merge and diff documents online",
"main": [
@@ -29,7 +29,7 @@
"url": "git://github.com/wickedest/Mergely"
},
"dependencies": {
"mergely": "https://github.com/wickedest/Mergely.git#3.4.2",
"mergely": "https://github.com/wickedest/Mergely.git#3.4.3",
"jquery": "<=2.1.3",
"codemirror": "<=5.11.0"
}