From eefbf5e61e90fc979bb0a4e9d9b1419c6dd4479d Mon Sep 17 00:00:00 2001
From: Makarand Bauskar <mbauskar@gmail.com>
Date: Tue, 8 Aug 2017 16:03:37 +0530
Subject: [PATCH 1/2] [v8.7.0] added change log for version 8.7.0 (#3878)

---
 frappe/change_log/v8/v8_7_0.md | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 frappe/change_log/v8/v8_7_0.md

diff --git a/frappe/change_log/v8/v8_7_0.md b/frappe/change_log/v8/v8_7_0.md
new file mode 100644
index 0000000000..c7b0b4d577
--- /dev/null
+++ b/frappe/change_log/v8/v8_7_0.md
@@ -0,0 +1,2 @@
+### User Permissions
+- User Permission is now a DocType, a new UX for the existing Role and User Permission managers to make it easy to enter permissions. For more details please check <a href="https://erpnext.org/docs/user/manual/en/setting-up/users-and-permissions/user-permissions">User Permissions</a>
\ No newline at end of file

From 02d9e69e60144919fdc24a5205abbc9623dba25b Mon Sep 17 00:00:00 2001
From: mbauskar <mbauskar@gmail.com>
Date: Tue, 8 Aug 2017 16:37:10 +0600
Subject: [PATCH 2/2] bumped to version 8.7.0

---
 frappe/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index a0eb02d432..538eb44bd2 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
 from .exceptions import *
 from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template
 
-__version__ = '8.6.8'
+__version__ = '8.7.0'
 __title__ = "Frappe Framework"
 
 local = Local()