Merge branch '3.1.0'

1 files changed, 0 insertions, 36 deletions

diff --git a/luarocks-dev-1.rockspec b/luarocks-dev-1.rockspec
deleted file mode 100644
index bc19e3ff..00000000
--- a/luarocks-dev-1.rockspec
+++ /dev/null
@@ -1,36 +0,0 @@
-rockspec_format = "3.0"
-package = "luarocks"
-version = "dev-1"
-source = {
-   url = "git+https://github.com/luarocks/luarocks"
-}
-description = {
-   summary = "A package manager for Lua modules.",
-   detailed = [[
-      LuaRocks allows you to install Lua modules as self-contained
-      packages called "rocks", which also contain version dependency
-      information. This information is used both during installation,
-      so that when one rock is requested all rocks it depends on are
-      installed as well, and at run time, so that when a module is
-      required, the correct version is loaded. LuaRocks supports both
-      local and remote repositories, and multiple local rocks trees. 
-   ]],
-   homepage = "http://www.luarocks.org",
-   issues_url = "https://github.com/luarocks/luarocks/issues",
-   maintainer = "Hisham Muhammad",
-   license = "MIT",
-}
-test_dependencies = {
-   "luacov",
-}
-test = {
-   type = "busted",
-   platforms = {
-      windows = {
-         flags = { "--exclude-tags=ssh,git,unix" }
-      },
-      unix = {
-         flags = { "--exclude-tags=ssh,git" }
-      }
-   }
-}