Merge branch 'master' into staging/17.09

1 files changed, 139 insertions, 0 deletions

diff --git a/makefu/5pkgs/beef/Gemfile.lock b/makefu/5pkgs/beef/Gemfile.lock
new file mode 100644
index 000000000..d2e6ad45e
--- /dev/null
+++ b/makefu/5pkgs/beef/Gemfile.lock
@@ -0,0 +1,139 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    ansi (1.5.0)
+    chunky_png (1.3.8)
+    daemons (1.2.4)
+    data_objects (0.10.17)
+      addressable (~> 2.1)
+    dm-core (1.2.1)
+      addressable (~> 2.3)
+    dm-do-adapter (1.2.0)
+      data_objects (~> 0.10.6)
+      dm-core (~> 1.2.0)
+    dm-migrations (1.2.0)
+      dm-core (~> 1.2.0)
+    dm-serializer (1.2.2)
+      dm-core (~> 1.2.0)
+      fastercsv (~> 1.5)
+      json (~> 1.6)
+      json_pure (~> 1.6)
+      multi_json (~> 1.0)
+    dm-sqlite-adapter (1.2.0)
+      dm-do-adapter (~> 1.2.0)
+      do_sqlite3 (~> 0.10.6)
+    do_sqlite3 (0.10.17)
+      data_objects (= 0.10.17)
+    em-websocket (0.5.1)
+      eventmachine (>= 0.12.9)
+      http_parser.rb (~> 0.6.0)
+    erubis (2.7.0)
+    espeak-ruby (1.0.4)
+    eventmachine (1.0.9.1)
+    execjs (2.7.0)
+    fastercsv (1.5.5)
+    filesize (0.1.1)
+    geoip (1.6.3)
+    http_parser.rb (0.6.0)
+    jsobfu (0.4.2)
+      rkelly-remix
+    json (1.8.6)
+    json_pure (1.8.6)
+    libv8 (3.16.14.19)
+    metasm (1.0.3)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.3.0)
+    mojo_magick (0.5.6)
+    msfrpc-client (1.1.1)
+      msgpack (~> 1)
+      rex (~> 2)
+    msgpack (1.1.0)
+    multi_json (1.12.2)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
+    parseconfig (1.0.8)
+    public_suffix (3.0.0)
+    qr4r (0.4.1)
+      mojo_magick
+      rqrcode
+    rack (1.6.8)
+    rack-protection (1.5.3)
+      rack
+    rainbow (2.2.2)
+      rake
+    rake (12.1.0)
+    rb-readline (0.5.5)
+    ref (2.0.0)
+    rex (2.0.11)
+      filesize
+      jsobfu (~> 0.4.1)
+      json
+      metasm (~> 1.0.2)
+      nokogiri
+      rb-readline
+      robots
+    rexec (1.6.3)
+      rainbow
+    rkelly-remix (0.0.7)
+    robots (0.10.1)
+    rqrcode (0.10.1)
+      chunky_png (~> 1.0)
+    rubydns (0.7.3)
+      eventmachine (~> 1.0.0)
+      rexec (~> 1.6.2)
+    rubyzip (1.2.1)
+    sinatra (1.4.8)
+      rack (~> 1.5)
+      rack-protection (~> 1.4)
+      tilt (>= 1.3, < 3)
+    term-ansicolor (1.6.0)
+      tins (~> 1.0)
+    therubyracer (0.12.3)
+      libv8 (~> 3.16.14.15)
+      ref
+    thin (1.7.2)
+      daemons (~> 1.0, >= 1.0.9)
+      eventmachine (~> 1.0, >= 1.0.4)
+      rack (>= 1, < 3)
+    tilt (2.0.8)
+    tins (1.15.0)
+    uglifier (3.2.0)
+      execjs (>= 0.3.0, < 3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  ansi
+  data_objects
+  dm-core
+  dm-migrations
+  dm-serializer
+  dm-sqlite-adapter
+  em-websocket
+  erubis
+  espeak-ruby (>= 1.0.4)
+  eventmachine
+  execjs
+  geoip
+  json
+  mime-types
+  msfrpc-client
+  nokogiri (>= 1.7)
+  parseconfig
+  qr4r
+  rack (~> 1.6.5)
+  rubydns (~> 0.7.3)
+  rubyzip (>= 1.2.1)
+  sinatra
+  term-ansicolor
+  therubyracer
+  thin
+  uglifier
+
+BUNDLED WITH
+   1.15.4