diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1bc99985..5053f69a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v1.0.10
+## 04/26/2016
+
+1. [](#new)
+ * Added an incompatibility notice when running Admin Plugin 1.0.x on Grav 1.1.x
+
# v1.0.9
## 02/11/2016
diff --git a/admin.php b/admin.php
index 0d96b067..da083924 100644
--- a/admin.php
+++ b/admin.php
@@ -244,6 +244,13 @@ class AdminPlugin extends Plugin
{
// Only activate admin if we're inside the admin path.
if ($this->active) {
+
+ // Temporary check for 1.1 versions
+ if (version_compare(GRAV_VERSION, '1.1.0-beta.1', '>=')) {
+ $messages = $this->grav['messages'];
+ $messages->add($this->grav['language']->translate(['PLUGIN_ADMIN.NEEDS_GRAV_1_1', GRAV_VERSION]), 'error');
+ }
+
if (php_sapi_name() == 'cli-server') {
throw new \RuntimeException('The Admin Plugin cannot run on the PHP built-in webserver. It needs Apache, Nginx or another full-featured web server.', 500);
}
diff --git a/blueprints.yaml b/blueprints.yaml
index 8f060104..06d592db 100644
--- a/blueprints.yaml
+++ b/blueprints.yaml
@@ -1,5 +1,5 @@
name: Admin Panel
-version: 1.0.9
+version: 1.0.10
description: Adds an advanced administration panel to manage your site
icon: empire
author:
diff --git a/languages/en.yaml b/languages/en.yaml
index 028d2e7f..c91f4622 100644
--- a/languages/en.yaml
+++ b/languages/en.yaml
@@ -478,4 +478,5 @@ PLUGIN_ADMIN:
ADD_FOLDER: "Add Folder"
PROXY_URL: "Proxy URL"
PROXY_URL_HELP: "Enter the proxy HOST or IP and PORT"
+ NEEDS_GRAV_1_1: " You are running Grav v%s. You must update to the latest Admin plugin v1.1.x in order to ensure compatibility. This may require switching to Testing GPM releases in the System configuration."