Merge pull request #1 from ckan/master

Merge CKAN master

CHANGELOG.md

@@ -3,12 +3,20 @@
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## Unreleased
+## [Unreleased]
 
-## 0.1.0 - 2017-03-23
+### Changed
+
+- Upgrade to font-awesome 4 on CKAN 2.7 and later (contributed by
+  [@mattfullerton](https://github.com/ckan/ckanext-pages/pull/51))
+
+## 0.1.0 (2017-03-23)
 
 First release following the [Semantic Versioning](http://semver.org/)
 guidelines (*ckanext-pages* has been publicly available before without tagged
 releases). This release captures the current state and serves as a baseline for
 tracking future changes.
 
+
+[Unreleased]: https://github.com/ckan/ckanext-pages/compare/release-v0.1.0...master
+