manuel/uhr
1
0
Fork 0
Code Issues 5 Pull requests Releases Wiki Activity

Merge branch 'develop' into feature/update-toolchain

Browse source 
Conflicts:
	VERSION
This commit is contained in:
Manuel Friedli 2015-01-18 16:52:55 +01:00
commit 9218b331f9
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
VERSION
View file

@ -1 +1 @@
7.0.0-next 8.0.0-dev.0

2
bower.json
View file

@ -1,6 +1,6 @@
{ {
"name": "uhr", "name": "uhr",
"version": "7.0.0-next", "version": "8.0.0-dev.0",
"dependencies": { "dependencies": {
"jquery": "~2.1.3", "jquery": "~2.1.3",
"jquery-ui": "~1.11.2", "jquery-ui": "~1.11.2",

2
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "uhr", "name": "uhr",
"version": "7.0.0-next", "version": "8.0.0-dev.0",
"description": "jQuery QLOCKTWO plugin", "description": "jQuery QLOCKTWO plugin",
"keywords": [ "keywords": [
"jquery-plugin", "jquery-plugin",