Merge branch 'changelog-base64' into 'master'

Changelog Base64

Add O'Reilly sponsorship in CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index d1644d6..78b3f95 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -18,6 +18,7 @@ v 6.5.0
   - Ability to customize merge commit message (sponsored by Say Media)
   - Search autocomplete via ajax
   - Add website url to user profile
+  - Files API supports base64 encoded content (sponsored by O'Reilly Media)
 
 v6.4.3
   - Don't use unicorn worker killer if PhusionPassenger is defined