diff options
| author | kondou <kondou@ts.unde.re> | 2013-08-20 17:20:30 +0200 |
|---|---|---|
| committer | kondou <kondou@ts.unde.re> | 2013-08-20 17:20:30 +0200 |
| commit | f1518a54dffb4a309da3952e154b71d4bc9482f8 (patch) | |
| tree | b6faeec269eb8904c5c8f42732e5466758fdeb0e /core/js/jquery.infieldlabel.js | |
| parent | 65d802329f8307cd010a306073d2d3ffd7dc7b74 (diff) | |
| parent | de949b1caa4491a8016ed5e609fc781526fea54d (diff) | |
| download | nextcloud-server-f1518a54dffb4a309da3952e154b71d4bc9482f8.tar.gz nextcloud-server-f1518a54dffb4a309da3952e154b71d4bc9482f8.zip | |
Merge branch 'master' into clean_up_util
Conflicts:
lib/util.php
Diffstat (limited to 'core/js/jquery.infieldlabel.js')
| -rw-r--r-- | core/js/jquery.infieldlabel.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/js/jquery.infieldlabel.js b/core/js/jquery.infieldlabel.js index 8a76da1b140..fad15102bcb 100644 --- a/core/js/jquery.infieldlabel.js +++ b/core/js/jquery.infieldlabel.js @@ -174,4 +174,4 @@ }); }; -}(jQuery));
\ No newline at end of file +}(jQuery)); |