diff options
| author | mpeterv <mpeterval@gmail.com> | 2016-04-16 11:39:18 +0300 |
|---|---|---|
| committer | mpeterv <mpeterval@gmail.com> | 2016-04-16 11:39:18 +0300 |
| commit | 53788ea4054cc619d610bf19d948e1a16325b89c (patch) | |
| tree | 6ed0c12f4110075ee8bbc202e5c82b60892b5b09 /COPYING | |
| parent | 3856404d5f38addd2d20d930bc0a64d1ecc2a5d5 (diff) | |
| parent | 3576869364203e2325a03960dd2c0d618355cb63 (diff) | |
| download | luarocks-53788ea4054cc619d610bf19d948e1a16325b89c.tar.gz luarocks-53788ea4054cc619d610bf19d948e1a16325b89c.tar.bz2 luarocks-53788ea4054cc619d610bf19d948e1a16325b89c.zip | |
Merge branch 'master' into luarocks-3
Conflicts:
src/luarocks/deps.lua
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions