Merge lp:~dholbach/developer-ubuntu-com/add-inherit-plugin into lp:developer-ubuntu-com

[Daniel Holbach]

[Daniel Holbach (dholbach)]

Needs a pip cache update.

=== modified file 'developer_portal/settings.py'
--- developer_portal/settings.py	2016-01-19 00:11:59 +0000
+++ developer_portal/settings.py	2016-02-19 10:15:10 +0000
@@ -59,6 +59,7 @@
     'djangocms_text_ckeditor',
 
     'cms', #django CMS itself
+    'djangocms_inherit',
     'djangocms_link',
     'djangocms_picture',
     'djangocms_video',
 
=== modified file 'requirements.txt'
--- requirements.txt	2016-01-19 00:11:59 +0000
+++ requirements.txt	2016-02-19 10:15:10 +0000
@@ -33,6 +33,7 @@
 django-templatetag-sugar==1.0
 django-xmlrpc==0.1.5
 djangocms-admin-style==1.0.8
+djangocms-inherit==0.1.1
 djangocms-link==1.7.1
 djangocms-picture==0.2.0
 djangocms-snippet==1.7.1