diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-04-07 17:10:45 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-04-07 17:10:45 +0200 |
| commit | 78e5410199559c37efff0c0d6851fd1555a39beb (patch) | |
| tree | bb240eb277fc987ad19719b7e49e018262bf29d1 /.jshintrc | |
| parent | d7bc23e16d54ea1f3c24fc9ec2297f6dcd7d856b (diff) | |
| parent | 1e559f72391b51089674e68871bf2502a5e5c75e (diff) | |
| download | nextcloud-server-78e5410199559c37efff0c0d6851fd1555a39beb.tar.gz nextcloud-server-78e5410199559c37efff0c0d6851fd1555a39beb.zip | |
Merge branch 'master' into jshint-globals-oc-t-n
Conflicts:
.jshintrc
Diffstat (limited to '.jshintrc')
| -rw-r--r-- | .jshintrc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.jshintrc b/.jshintrc index 02fbd84e6a8..77f9e9f143d 100644 --- a/.jshintrc +++ b/.jshintrc @@ -24,6 +24,7 @@ "afterEach": true, "sinon": true, "fakeServer": true, + "_": true, "OC": true, "t": true, "n": true |