Merge branch 'master' into develop
Conflicts: dist/libs.js dist/libs.min.js
This commit is contained in:
commit
eec51682ac
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "uhr",
|
||||
"version": "8.0.2-dev.0",
|
||||
"version": "8.0.2",
|
||||
"dependencies": {
|
||||
"jquery": "~2.1.3",
|
||||
"jquery-ui": "~1.11.2",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/*! uhr - v8.0.2-dev.0 - 2015-07-15
|
||||
/*! uhr - v8.0.2 - 2016-06-27
|
||||
* http://bärneruhr.ch/
|
||||
* Copyright (c) 2015 Manuel Friedli; Licensed GPL-3.0 */
|
||||
* Copyright (c) 2016 Manuel Friedli; Licensed GPL-3.0 */
|
||||
(function($) {
|
||||
'use strict';
|
||||
var uhrGlobals = {
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -1,6 +1,6 @@
|
|||
/*! uhr - v8.0.2-dev.0 - 2015-07-15
|
||||
/*! uhr - v8.0.2 - 2016-06-27
|
||||
* http://bärneruhr.ch/
|
||||
* Copyright (c) 2015 Manuel Friedli; Licensed GPL-3.0 */
|
||||
* Copyright (c) 2016 Manuel Friedli; Licensed GPL-3.0 */
|
||||
(function($) {
|
||||
'use strict';
|
||||
var es_ist = {1: [1, 2, 4, 5, 6]};
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -1,6 +1,6 @@
|
|||
/*! uhr - v8.0.2-dev.0 - 2015-07-15
|
||||
/*! uhr - v8.0.2 - 2016-06-27
|
||||
* http://bärneruhr.ch/
|
||||
* Copyright (c) 2015 Manuel Friedli; Licensed GPL-3.0 */
|
||||
* Copyright (c) 2016 Manuel Friedli; Licensed GPL-3.0 */
|
||||
(function($) {
|
||||
'use strict';
|
||||
var uhrGlobals = {
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -1,6 +1,6 @@
|
|||
/*! uhr - v8.0.2-dev.0 - 2015-07-15
|
||||
/*! uhr - v8.0.2 - 2016-06-27
|
||||
* http://bärneruhr.ch/
|
||||
* Copyright (c) 2015 Manuel Friedli; Licensed GPL-3.0 */
|
||||
* Copyright (c) 2016 Manuel Friedli; Licensed GPL-3.0 */
|
||||
(function($) {
|
||||
'use strict';
|
||||
var es_ist = {1: [1, 2, 4, 5, 6]};
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -1,6 +1,6 @@
|
|||
/*! uhr - v8.0.2-dev.0 - 2015-07-15
|
||||
/*! uhr - v8.0.2 - 2016-06-27
|
||||
* http://bärneruhr.ch/
|
||||
* Copyright (c) 2015 Manuel Friedli; Licensed GPL-3.0 */
|
||||
* Copyright (c) 2016 Manuel Friedli; Licensed GPL-3.0 */
|
||||
(function($) {
|
||||
'use strict';
|
||||
var uhrGlobals = {
|
||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
|
@ -1,5 +1,5 @@
|
|||
CACHE MANIFEST
|
||||
# Version 8.0.2-dev.0
|
||||
# Version 8.0.2
|
||||
|
||||
/
|
||||
dist/jquery.uhr.base.min.js
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "uhr",
|
||||
"version": "8.0.2-dev.0",
|
||||
"version": "8.0.2",
|
||||
"description": "jQuery QLOCKTWO plugin",
|
||||
"keywords": [
|
||||
"jquery-plugin",
|
||||
|
|
Loading…
Reference in New Issue