Merge branch 'diff' of git://github.com/younes0/BookStack into younes0-diff

diff --cc app/Http/Controllers/PageController.php
Simple merge

diff --cc app/PageRevision.php
Simple merge

diff --cc composer.json
index d9603701998f1fd6db56a73bb12d378ac2641e41,d1f99a8f3c8004121dfe4aa87ee5b2a6a9ae5ba7..7d4b5e62b03a1132b39efe3d3f39fe9b2f47bf59
--- 1/composer.json
--- 2/composer.json
+++ b/composer.json
@@@ -5,15 -5,18 +5,17 @@@
      "license": "MIT",
      "type": "project",
      "require": {
 -        "php": ">=5.5.9",
 +        "php": ">=5.6.4",
 +        "laravel/framework": "^5.3.4",
+         "ext-tidy": "*",
 -
 -        "laravel/framework": "5.2.*",
          "intervention/image": "^2.3",
          "laravel/socialite": "^2.0",
          "barryvdh/laravel-ide-helper": "^2.1",
 -        "barryvdh/laravel-debugbar": "^2.0",
 +        "barryvdh/laravel-debugbar": "^2.2.3",
          "league/flysystem-aws-s3-v3": "^1.0",
 -        "barryvdh/laravel-dompdf": "0.6.*",
 -        "predis/predis": "^1.0",
 +        "barryvdh/laravel-dompdf": "^0.7",
-         "predis/predis": "^1.1"
++        "predis/predis": "^1.1",
+         "gathercontent/htmldiff": "^0.2.1"
      },
      "require-dev": {
          "fzaninotto/faker": "~1.4",

diff --cc composer.lock
index c1c80e100b9b11cf2cd648b3785dd43caa3f30ec,98fb86ce585a4100d025a599b15d4eac52d75ecf..74a0902882376a9d16fc1a8ac18f5398a0c1c33f
--- 1/composer.lock
--- 2/composer.lock
+++ b/composer.lock
@@@ -4,21 -4,21 +4,21 @@@
          "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
          "This file is @generated automatically"
      ],
-     "hash": "c90a6e41767306ceb3b8cedb91468390",
-     "content-hash": "3b5d2d6b77fbe71101e7e8eaff0754fe",
 -    "hash": "097beaeb7ce90384b824d65d9dd36520",
 -    "content-hash": "233ce3d93ee0c9b005c263ff1449ae0f",
++    "hash": "3124d900cfe857392a94de479f3ff6d4",
++    "content-hash": "a968767a73f77e66e865c276cf76eedf",
      "packages": [
          {
              "name": "aws/aws-sdk-php",
-             "version": "3.19.6",
 -            "version": "3.18.25",
++            "version": "3.19.11",
              "source": {
                  "type": "git",
                  "url": "https://github.com/aws/aws-sdk-php.git",
-                 "reference": "34060bf0db260031697b17dbb37fa1bbec92f1c4"
 -                "reference": "37a8ce927a69de3d821c21b64674a2b3b9d1d247"
++                "reference": "19bac3bdd7988cbf7f89d5ce8e2748d774e2cde8"
              },
              "dist": {
                  "type": "zip",
-                 "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/34060bf0db260031697b17dbb37fa1bbec92f1c4",
-                 "reference": "34060bf0db260031697b17dbb37fa1bbec92f1c4",
 -                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/37a8ce927a69de3d821c21b64674a2b3b9d1d247",
 -                "reference": "37a8ce927a69de3d821c21b64674a2b3b9d1d247",
++                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/19bac3bdd7988cbf7f89d5ce8e2748d774e2cde8",
++                "reference": "19bac3bdd7988cbf7f89d5ce8e2748d774e2cde8",
                  "shasum": ""
              },
              "require": {
@@@ -85,32 -85,32 +85,32 @@@
                  "s3",
                  "sdk"
              ],
-             "time": "2016-09-08 20:27:15"
 -            "time": "2016-07-05 19:25:06"
++            "time": "2016-09-27 19:38:36"
          },
          {
              "name": "barryvdh/laravel-debugbar",
-             "version": "V2.2.3",
 -            "version": "v2.2.2",
++            "version": "v2.3.0",
              "source": {
                  "type": "git",
                  "url": "https://github.com/barryvdh/laravel-debugbar.git",
-                 "reference": "ecd1ce5c4a827e2f6a8fb41bcf67713beb1c1cbd"
 -                "reference": "c291e58d0a13953e0f68d99182ee77ebc693edc0"
++                "reference": "0c87981df959c7c1943abe227baf607c92f204f9"
              },
              "dist": {
                  "type": "zip",
-                 "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/ecd1ce5c4a827e2f6a8fb41bcf67713beb1c1cbd",
-                 "reference": "ecd1ce5c4a827e2f6a8fb41bcf67713beb1c1cbd",
 -                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/c291e58d0a13953e0f68d99182ee77ebc693edc0",
 -                "reference": "c291e58d0a13953e0f68d99182ee77ebc693edc0",
++                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/0c87981df959c7c1943abe227baf607c92f204f9",
++                "reference": "0c87981df959c7c1943abe227baf607c92f204f9",
                  "shasum": ""
              },
              "require": {
 -                "illuminate/support": "5.1.*|5.2.*",
 -                "maximebf/debugbar": "~1.11.0",
 +                "illuminate/support": "5.1.*|5.2.*|5.3.*",
-                 "maximebf/debugbar": "~1.11.0|~1.12.0",
++                "maximebf/debugbar": "~1.13.0",
                  "php": ">=5.5.9",
                  "symfony/finder": "~2.7|~3.0"
              },
              "type": "library",
              "extra": {
                  "branch-alias": {
--                    "dev-master": "2.2-dev"
++                    "dev-master": "2.3-dev"
                  }
              },
              "autoload": {
@@@ -139,7 -139,7 +139,7 @@@
                  "profiler",
                  "webprofiler"
              ],
-             "time": "2016-07-29 15:00:36"
 -            "time": "2016-05-11 13:54:43"
++            "time": "2016-09-15 14:05:56"
          },
          {
              "name": "barryvdh/laravel-dompdf",
@@@ -517,11 -548,153 +568,60 @@@
              ],
              "description": "DOMPDF is a CSS 2.1 compliant HTML to PDF converter",
              "homepage": "https://github.com/dompdf/dompdf",
 -            "time": "2015-12-07 04:07:13"
 +            "time": "2016-05-11 00:36:29"
          },
 -        {
 -            "name": "guzzle/guzzle",
 -            "version": "v3.8.1",
 -            "source": {
 -                "type": "git",
 -                "url": "https://github.com/guzzle/guzzle.git",
 -                "reference": "4de0618a01b34aa1c8c33a3f13f396dcd3882eba"
 -            },
 -            "dist": {
 -                "type": "zip",
 -                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/4de0618a01b34aa1c8c33a3f13f396dcd3882eba",
 -                "reference": "4de0618a01b34aa1c8c33a3f13f396dcd3882eba",
 -                "shasum": ""
 -            },
 -            "require": {
 -                "ext-curl": "*",
 -                "php": ">=5.3.3",
 -                "symfony/event-dispatcher": ">=2.1"
 -            },
 -            "replace": {
 -                "guzzle/batch": "self.version",
 -                "guzzle/cache": "self.version",
 -                "guzzle/common": "self.version",
 -                "guzzle/http": "self.version",
 -                "guzzle/inflection": "self.version",
 -                "guzzle/iterator": "self.version",
 -                "guzzle/log": "self.version",
 -                "guzzle/parser": "self.version",
 -                "guzzle/plugin": "self.version",
 -                "guzzle/plugin-async": "self.version",
 -                "guzzle/plugin-backoff": "self.version",
 -                "guzzle/plugin-cache": "self.version",
 -                "guzzle/plugin-cookie": "self.version",
 -                "guzzle/plugin-curlauth": "self.version",
 -                "guzzle/plugin-error-response": "self.version",
 -                "guzzle/plugin-history": "self.version",
 -                "guzzle/plugin-log": "self.version",
 -                "guzzle/plugin-md5": "self.version",
 -                "guzzle/plugin-mock": "self.version",
 -                "guzzle/plugin-oauth": "self.version",
 -                "guzzle/service": "self.version",
 -                "guzzle/stream": "self.version"
 -            },
 -            "require-dev": {
 -                "doctrine/cache": "*",
 -                "monolog/monolog": "1.*",
 -                "phpunit/phpunit": "3.7.*",
 -                "psr/log": "1.0.*",
 -                "symfony/class-loader": "*",
 -                "zendframework/zend-cache": "<2.3",
 -                "zendframework/zend-log": "<2.3"
 -            },
 -            "type": "library",
 -            "extra": {
 -                "branch-alias": {
 -                    "dev-master": "3.8-dev"
 -                }
 -            },
 -            "autoload": {
 -                "psr-0": {
 -                    "Guzzle": "src/",
 -                    "Guzzle\\Tests": "tests/"
 -                }
 -            },
 -            "notification-url": "https://packagist.org/downloads/",
 -            "license": [
 -                "MIT"
 -            ],
 -            "authors": [
 -                {
 -                    "name": "Michael Dowling",
 -                    "email": "[email protected]",
 -                    "homepage": "https://github.com/mtdowling"
 -                },
 -                {
 -                    "name": "Guzzle Community",
 -                    "homepage": "https://github.com/guzzle/guzzle/contributors"
 -                }
 -            ],
 -            "description": "Guzzle is a PHP HTTP client library and framework for building RESTful web service clients",
 -            "homepage": "http://guzzlephp.org/",
 -            "keywords": [
 -                "client",
 -                "curl",
 -                "framework",
 -                "http",
 -                "http client",
 -                "rest",
 -                "web service"
 -            ],
 -            "abandoned": "guzzlehttp/guzzle",
 -            "time": "2014-01-28 22:29:15"
 -        },
+         {
+             "name": "gathercontent/htmldiff",
+             "version": "0.2.1",
+             "source": {
+                 "type": "git",
+                 "url": "https://github.com/gathercontent/htmldiff.git",
+                 "reference": "24674a62315f64330134b4a4c5b01a7b59193c93"
+             },
+             "dist": {
+                 "type": "zip",
+                 "url": "https://api.github.com/repos/gathercontent/htmldiff/zipball/24674a62315f64330134b4a4c5b01a7b59193c93",
+                 "reference": "24674a62315f64330134b4a4c5b01a7b59193c93",
+                 "shasum": ""
+             },
+             "require": {
+                 "cogpowered/finediff": "0.3.1",
+                 "ext-tidy": "*"
+             },
+             "require-dev": {
+                 "phpunit/phpunit": "4.*",
+                 "squizlabs/php_codesniffer": "1.*"
+             },
+             "type": "library",
+             "autoload": {
+                 "psr-0": {
+                     "GatherContent\\Htmldiff": "src/"
+                 }
+             },
+             "notification-url": "https://packagist.org/downloads/",
+             "license": [
+                 "MIT"
+             ],
+             "authors": [
+                 {
+                     "name": "Andrew Cairns",
+                     "email": "[email protected]"
+                 },
+                 {
+                     "name": "Mathew Chapman",
+                     "email": "[email protected]"
+                 },
+                 {
+                     "name": "Peter Legierski",
+                     "email": "[email protected]"
+                 }
+             ],
+             "description": "Compare two HTML strings",
+             "time": "2015-04-15 15:39:46"
+         },
          {
              "name": "guzzlehttp/guzzle",
 -            "version": "6.2.0",
 +            "version": "6.2.1",
              "source": {
                  "type": "git",
                  "url": "https://github.com/guzzle/guzzle.git",
@@@ -899,16 -1072,16 +999,16 @@@
          },
          {
              "name": "laravel/framework",
-             "version": "v5.3.9",
 -            "version": "v5.2.39",
++            "version": "v5.3.11",
              "source": {
                  "type": "git",
                  "url": "https://github.com/laravel/framework.git",
-                 "reference": "f6fbb481672f8dc4bc6882d5d654bbfa3588c8ec"
 -                "reference": "c2a77050269b4e03bd9a735a9f24e573a7598b8a"
++                "reference": "ca48001b95a0543fb39fcd7219de960bbc03eaa5"
              },
              "dist": {
                  "type": "zip",
-                 "url": "https://api.github.com/repos/laravel/framework/zipball/f6fbb481672f8dc4bc6882d5d654bbfa3588c8ec",
-                 "reference": "f6fbb481672f8dc4bc6882d5d654bbfa3588c8ec",
 -                "url": "https://api.github.com/repos/laravel/framework/zipball/c2a77050269b4e03bd9a735a9f24e573a7598b8a",
 -                "reference": "c2a77050269b4e03bd9a735a9f24e573a7598b8a",
++                "url": "https://api.github.com/repos/laravel/framework/zipball/ca48001b95a0543fb39fcd7219de960bbc03eaa5",
++                "reference": "ca48001b95a0543fb39fcd7219de960bbc03eaa5",
                  "shasum": ""
              },
              "require": {
@@@ -956,6 -1129,6 +1056,7 @@@
                  "illuminate/http": "self.version",
                  "illuminate/log": "self.version",
                  "illuminate/mail": "self.version",
++                "illuminate/notifications": "self.version",
                  "illuminate/pagination": "self.version",
                  "illuminate/pipeline": "self.version",
                  "illuminate/queue": "self.version",
@@@ -1022,7 -1197,7 +1123,7 @@@
                  "framework",
                  "laravel"
              ],
-             "time": "2016-09-12 14:08:29"
 -            "time": "2016-06-17 19:25:12"
++            "time": "2016-09-28 02:15:37"
          },
          {
              "name": "laravel/socialite",
@@@ -1273,16 -1448,16 +1374,16 @@@
          },
          {
              "name": "maximebf/debugbar",
-             "version": "v1.12.0",
 -            "version": "v1.11.1",
++            "version": "v1.13.0",
              "source": {
                  "type": "git",
                  "url": "https://github.com/maximebf/php-debugbar.git",
-                 "reference": "e634fbd32cd6bc3fa0e8c972b52d4bf49bab3988"
 -                "reference": "d9302891c1f0a0ac5a4f66725163a00537c6359f"
++                "reference": "5f49a5ed6cfde81d31d89378806670d77462526e"
              },
              "dist": {
                  "type": "zip",
-                 "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/e634fbd32cd6bc3fa0e8c972b52d4bf49bab3988",
-                 "reference": "e634fbd32cd6bc3fa0e8c972b52d4bf49bab3988",
 -                "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/d9302891c1f0a0ac5a4f66725163a00537c6359f",
 -                "reference": "d9302891c1f0a0ac5a4f66725163a00537c6359f",
++                "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/5f49a5ed6cfde81d31d89378806670d77462526e",
++                "reference": "5f49a5ed6cfde81d31d89378806670d77462526e",
                  "shasum": ""
              },
              "require": {
@@@ -1301,7 -1476,7 +1402,7 @@@
              "type": "library",
              "extra": {
                  "branch-alias": {
-                     "dev-master": "1.12-dev"
 -                    "dev-master": "1.11-dev"
++                    "dev-master": "1.13-dev"
                  }
              },
              "autoload": {
@@@ -1330,7 -1505,7 +1431,7 @@@
                  "debug",
                  "debugbar"
              ],
-             "time": "2016-05-15 13:11:34"
 -            "time": "2016-01-22 12:22:23"
++            "time": "2016-09-15 14:01:59"
          },
          {
              "name": "monolog/monolog",
@@@ -1558,16 -1733,16 +1659,16 @@@
          },
          {
              "name": "nikic/php-parser",
--            "version": "v2.1.0",
++            "version": "v2.1.1",
              "source": {
                  "type": "git",
                  "url": "https://github.com/nikic/PHP-Parser.git",
--                "reference": "47b254ea51f1d6d5dc04b9b299e88346bf2369e3"
++                "reference": "4dd659edadffdc2143e4753df655d866dbfeedf0"
              },
              "dist": {
                  "type": "zip",
--                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/47b254ea51f1d6d5dc04b9b299e88346bf2369e3",
--                "reference": "47b254ea51f1d6d5dc04b9b299e88346bf2369e3",
++                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4dd659edadffdc2143e4753df655d866dbfeedf0",
++                "reference": "4dd659edadffdc2143e4753df655d866dbfeedf0",
                  "shasum": ""
              },
              "require": {
@@@ -1605,7 -1780,7 +1706,7 @@@
                  "parser",
                  "php"
              ],
--            "time": "2016-04-19 13:41:41"
++            "time": "2016-09-16 12:04:44"
          },
          {
              "name": "paragonie/random_compat",
@@@ -1825,22 -1965,22 +1926,30 @@@
          },
          {
              "name": "psr/log",
--            "version": "1.0.0",
++            "version": "1.0.1",
              "source": {
                  "type": "git",
                  "url": "https://github.com/php-fig/log.git",
--                "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
++                "reference": "5277094ed527a1c4477177d102fe4c53551953e0"
              },
              "dist": {
                  "type": "zip",
--                "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b",
--                "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b",
++                "url": "https://api.github.com/repos/php-fig/log/zipball/5277094ed527a1c4477177d102fe4c53551953e0",
++                "reference": "5277094ed527a1c4477177d102fe4c53551953e0",
                  "shasum": ""
              },
++            "require": {
++                "php": ">=5.3.0"
++            },
              "type": "library",
++            "extra": {
++                "branch-alias": {
++                    "dev-master": "1.0.x-dev"
++                }
++            },
              "autoload": {
--                "psr-0": {
--                    "Psr\\Log\\": ""
++                "psr-4": {
++                    "Psr\\Log\\": "Psr/Log/"
                  }
              },
              "notification-url": "https://packagist.org/downloads/",
@@@ -1854,12 -1994,12 +1963,13 @@@
                  }
              ],
              "description": "Common interface for logging libraries",
++            "homepage": "https://github.com/php-fig/log",
              "keywords": [
                  "log",
                  "psr",
                  "psr-3"
              ],
--            "time": "2012-12-21 11:40:51"
++            "time": "2016-09-19 16:02:08"
          },
          {
              "name": "psy/psysh",
@@@ -3165,48 -3269,6 +3275,48 @@@
              ],
              "time": "2016-05-22 21:52:33"
          },
-             "version": "1.5.2",
 +        {
 +            "name": "myclabs/deep-copy",
-                 "reference": "da8529775f14f4fdae33f916eb0cf65f6afbddbc"
++            "version": "1.5.4",
 +            "source": {
 +                "type": "git",
 +                "url": "https://github.com/myclabs/DeepCopy.git",
-                 "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/da8529775f14f4fdae33f916eb0cf65f6afbddbc",
-                 "reference": "da8529775f14f4fdae33f916eb0cf65f6afbddbc",
++                "reference": "ea74994a3dc7f8d2f65a06009348f2d63c81e61f"
 +            },
 +            "dist": {
 +                "type": "zip",
-             "time": "2016-09-06 16:07:05"
++                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/ea74994a3dc7f8d2f65a06009348f2d63c81e61f",
++                "reference": "ea74994a3dc7f8d2f65a06009348f2d63c81e61f",
 +                "shasum": ""
 +            },
 +            "require": {
 +                "php": ">=5.4.0"
 +            },
 +            "require-dev": {
 +                "doctrine/collections": "1.*",
 +                "phpunit/phpunit": "~4.1"
 +            },
 +            "type": "library",
 +            "autoload": {
 +                "psr-4": {
 +                    "DeepCopy\\": "src/DeepCopy/"
 +                }
 +            },
 +            "notification-url": "https://packagist.org/downloads/",
 +            "license": [
 +                "MIT"
 +            ],
 +            "description": "Create deep copies (clones) of your objects",
 +            "homepage": "https://github.com/myclabs/DeepCopy",
 +            "keywords": [
 +                "clone",
 +                "copy",
 +                "duplicate",
 +                "object",
 +                "object graph"
 +            ],
++            "time": "2016-09-16 13:37:59"
 +        },
          {
              "name": "phpdocumentor/reflection-common",
              "version": "1.0",
@@@ -3661,46 -3834,40 +3771,51 @@@
          },
          {
              "name": "phpunit/phpunit",
-             "version": "5.5.4",
 -            "version": "4.8.26",
++            "version": "5.5.5",
              "source": {
                  "type": "git",
                  "url": "https://github.com/sebastianbergmann/phpunit.git",
-                 "reference": "3e6e88e56c912133de6e99b87728cca7ed70c5f5"
 -                "reference": "fc1d8cd5b5de11625979125c5639347896ac2c74"
++                "reference": "a57126dc681b08289fef6ac96a48e30656f84350"
              },
              "dist": {
                  "type": "zip",
-                 "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3e6e88e56c912133de6e99b87728cca7ed70c5f5",
-                 "reference": "3e6e88e56c912133de6e99b87728cca7ed70c5f5",
 -                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fc1d8cd5b5de11625979125c5639347896ac2c74",
 -                "reference": "fc1d8cd5b5de11625979125c5639347896ac2c74",
++                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a57126dc681b08289fef6ac96a48e30656f84350",
++                "reference": "a57126dc681b08289fef6ac96a48e30656f84350",
                  "shasum": ""
              },
              "require": {
                  "ext-dom": "*",
                  "ext-json": "*",
--                "ext-pcre": "*",
--                "ext-reflection": "*",
--                "ext-spl": "*",
 -                "php": ">=5.3.3",
++                "ext-libxml": "*",
++                "ext-mbstring": "*",
++                "ext-xml": "*",
 +                "myclabs/deep-copy": "~1.3",
 +                "php": "^5.6 || ^7.0",
                  "phpspec/prophecy": "^1.3.1",
 -                "phpunit/php-code-coverage": "~2.1",
 +                "phpunit/php-code-coverage": "^4.0.1",
                  "phpunit/php-file-iterator": "~1.4",
                  "phpunit/php-text-template": "~1.2",
                  "phpunit/php-timer": "^1.0.6",
 -                "phpunit/phpunit-mock-objects": "~2.3",
 +                "phpunit/phpunit-mock-objects": "^3.2",
                  "sebastian/comparator": "~1.1",
                  "sebastian/diff": "~1.2",
 -                "sebastian/environment": "~1.3",
 +                "sebastian/environment": "^1.3 || ^2.0",
                  "sebastian/exporter": "~1.2",
                  "sebastian/global-state": "~1.0",
 -                "sebastian/version": "~1.0",
 +                "sebastian/object-enumerator": "~1.0",
 +                "sebastian/resource-operations": "~1.0",
 +                "sebastian/version": "~1.0|~2.0",
                  "symfony/yaml": "~2.1|~3.0"
              },
 +            "conflict": {
 +                "phpdocumentor/reflection-docblock": "3.0.2"
 +            },
++            "require-dev": {
++                "ext-pdo": "*"
++            },
              "suggest": {
++                "ext-tidy": "*",
++                "ext-xdebug": "*",
                  "phpunit/php-invoker": "~1.1"
              },
              "bin": [
@@@ -3735,7 -3902,7 +3850,7 @@@
                  "testing",
                  "xunit"
              ],
-             "time": "2016-08-26 07:11:44"
 -            "time": "2016-05-17 03:09:28"
++            "time": "2016-09-21 14:40:13"
          },
          {
              "name": "phpunit/phpunit-mock-objects",
@@@ -4524,7 -4546,7 +4639,8 @@@
      "prefer-stable": false,
      "prefer-lowest": false,
      "platform": {
-         "php": ">=5.6.4"
 -        "php": ">=5.5.9"
++        "php": ">=5.6.4",
++        "ext-tidy": "*"
      },
      "platform-dev": []
  }

diff --cc resources/assets/sass/_pages.scss
index 42ca0a21f83dbb93dbe0a52c159a83c59eef2299,562bc9a4788ba66d4030bd9f82933ef9b3719cd3..e608295a806756b084f1ad7e12867933c2f74d6d
mode 100644,100755..100755
--- 1/resources/assets/sass/_pages.scss
--- 2/resources/assets/sass/_pages.scss
+++ b/resources/assets/sass/_pages.scss
@@@ -66,11 -56,22 +66,23 @@@
      margin: $-m 0;
    }
    table {
 -    word-break: break-all;
 -    word-break: break-word;
      hyphens: auto;
 +    table-layout: fixed;
 +    max-width: 100%;
 +    height: auto !important;
    }
+ 
+   // diffs
+   ins,
+   del {
+     text-decoration: none;
+   }
+   ins {
+     background: #dbffdb;
+   }
+   del {
+     background: #FFECEC;
+   }
  }
  
  // Page content pointers

diff --cc resources/views/pages/page-display.blade.php
Simple merge