diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2016-08-11 19:39:32 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@statuscode.ch> | 2016-08-11 19:40:52 +0200 |
| commit | 82bf4796f9eafab5d6353f16b2b29b5f60dc34e4 (patch) | |
| tree | 3d4eb85b20de427f3555fc7339bd8d06d9a94f43 /.jshintrc | |
| parent | 8261ccce1be32c1467874d537240585c0d841600 (diff) | |
| download | nextcloud-server-82bf4796f9eafab5d6353f16b2b29b5f60dc34e4.tar.gz nextcloud-server-82bf4796f9eafab5d6353f16b2b29b5f60dc34e4.zip | |
Resolve conflict
Diffstat (limited to '.jshintrc')
0 files changed, 0 insertions, 0 deletions