Merge branch 'release/2.7.7'

mailup · Jan 27, 2018 · be466f1 · be466f1
2 parents 00ae2d5 + a8afd8e
commit be466f1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,12 @@
-CHANGELOG
-=========
-(date follow ISO format - 06 is for June)
+# Changelog
+
+Changelog follow this format from 2.7.7 [Keep a changelog](http://keepachangelog.com/)
 
 ## [2.7.7]
 
 ### Changed
 - add compatibility for php7 (thanks to [azambon](https://github.com/azambon))
+- change license version
 
 ## 2.7.6
 - [fix] admin config | close save config only to mailup section

diff --git a/README.md b/README.md
@@ -32,4 +32,7 @@ You can also open an issue to advice any kind of error.
 ---
 
 ### Privacy Policy
-Please look at [privacy_policy.md](privacy_policy.md)
+Please look at [privacy_policy.md](privacy_policy.md)
+
+### Disclaimer
+Do not install the extension directly on production environment. Try before locally or in stage environment.  
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "mailup/magento",
   "type": "magento-module",
-  "license": "AFL",
+  "license": "AFL-3.0",
   "homepage": "https://github.com/mailup/mailup-magento",
   "description": "Magento 1.x CE Module for MailUp Integration",
   "authors": [