Merge branch 'master' of https://github.com/defold/defold.github.io

Author: britzl

_data/extensions/extension-xsolla_shop.json

@@ -137,6 +137,34 @@
             "returnvalues": [],
             "type": "FUNCTION"
         },
+        {
+            "description": "get the payment url for an order",
+            "examples": "",
+            "name": "shop.get_payment_url",
+            "parameters": [
+                {
+                    "doc": "",
+                    "name": "order",
+                    "types": [
+                        "table"
+                    ]
+                },
+                {
+                    "doc": "",
+                    "name": "is_sandbox",
+                    "types": [
+                        "boolean"
+                    ]
+                }
+            ],
+            "returnvalues": [
+                {
+                    "doc": "",
+                    "name": "string"
+                }
+            ],
+            "type": "FUNCTION"
+        },
         {
             "description": "Get list of bundles",
             "examples": "",

extension-spine/index.md

@@ -470,7 +470,7 @@ So what do you do if your animation references "head_parts/eyes"? The easiest wa
 
 ![Atlas path names](atlas_names.png)
 ## API reference
-[API Reference - gui](/extension-spine/gui_api)
+[API Reference - spine](/extension-spine/spine_api)
 
 ## API reference
-[API Reference - spine](/extension-spine/spine_api)
+[API Reference - gui](/extension-spine/gui_api)