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 /.scrutinizer.yml | |
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 '.scrutinizer.yml')
0 files changed, 0 insertions, 0 deletions