Merge branch 'dev'

hollodotme · Jan 3, 2017 · ad4c2bd · ad4c2bd
2 parents a3c4fe0 + 305f9e9
commit ad4c2bd
Showing 1 changed file with 0 additions and 0 deletions.
diff --git a/CHANGELOG → CHANGELOG.md b/CHANGELOG → CHANGELOG.md