Merge remote-tracking branch 'web2py/master'

2016-11-10 01:14:40 -08:00
parent 7615848f83 4ea31820aa
commit 46ce04355f
1 changed files with 1 additions and 1 deletions
@@ -1960,7 +1960,7 @@ def git_push():

 def plugins():
    app = request.args(0)
-    from serializers import loads_json
+    from gluon.serializers import loads_json
    if not session.plugins:
        try:
            rawlist = urlopen("http://www.web2pyslices.com/" +