Merge branch 'dev' into issue-1044-account-deletion

This commit is contained in:
Shiny
2017-05-28 20:54:02 +12:00
committed by GitHub

View File

@@ -304,7 +304,7 @@ GEM
multi_xml (0.6.0)
multipart-post (2.0.0)
nenv (0.3.0)
newrelic_rpm (4.1.0.333)
newrelic_rpm (4.2.0.334)
nokogiri (1.7.2)
mini_portile2 (~> 2.1.0)
notiffany (0.1.1)
@@ -508,7 +508,7 @@ GEM
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)
will_paginate (3.1.5)
xpath (2.0.0)
xpath (2.1.0)
nokogiri (~> 1.3)
PLATFORMS