Merge remote-tracking branch 'origin/1.5' into 1.5

# Conflicts: # CHANGELOG.md
getgrav · Jul 5, 2018 · 48a3228 · 48a3228
2 parents be661e8 + d214080
commit 48a3228
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,7 +17,7 @@
     * Fixed `Route::withQueryParam()` to accept array values
     * Fixed typo in truncate function [#1943](https://github.com/getgrav/grav/issues/1943)
     * Fixed blueprint field validation: Allow numeric inputs in text fields
-        
+
 # v1.4.7
 ## mm/dd/2018