merge master to 1.10, with fixes (#7682)

2018-03-08 14:03:55 -05:00
parent 7f40782850
commit 3d79703d23
60 changed files with 26896 additions and 762 deletions
@@ -13,11 +13,16 @@ incremental: true
 safe: false
 lsi: false

+<<<<<<< HEAD
 latest: "v1.10"

 paginate: 7
 paginate_path: "/blog/page:num/"

+||||||| merged common ancestors
+=======
+latest: "v1.9"
+>>>>>>> merge master to 1.10, with fixes (#7682)
 defaults:
  -
    scope: