Ubuntu Developer Portal

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

  1. add-inherit-plugin
  2. Merge into stable
Proposed by Daniel Holbach
Status: Merged
Approved by: David Callé
Approved revision: 192
Merged at revision: 193
Proposed branch: lp:~dholbach/developer-ubuntu-com/add-inherit-plugin
Merge into: lp:developer-ubuntu-com
Diff against target: 23 lines (+2/-0)
2 files modified
developer_portal/settings.py (+1/-0)
requirements.txt (+1/-0)
To merge this branch: bzr merge lp:~dholbach/developer-ubuntu-com/add-inherit-plugin
Reviewer Review Type Date Requested Status
Ubuntu App Developer site developers Pending
Review via email: mp+286622@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Needs a pip cache update.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'developer_portal/settings.py'
2--- developer_portal/settings.py 2016-01-19 00:11:59 +0000
3+++ developer_portal/settings.py 2016-02-19 10:15:10 +0000
4@@ -59,6 +59,7 @@
5 'djangocms_text_ckeditor',
6
7 'cms', #django CMS itself
8+ 'djangocms_inherit',
9 'djangocms_link',
10 'djangocms_picture',
11 'djangocms_video',
12
13=== modified file 'requirements.txt'
14--- requirements.txt 2016-01-19 00:11:59 +0000
15+++ requirements.txt 2016-02-19 10:15:10 +0000
16@@ -33,6 +33,7 @@
17 django-templatetag-sugar==1.0
18 django-xmlrpc==0.1.5
19 djangocms-admin-style==1.0.8
20+djangocms-inherit==0.1.1
21 djangocms-link==1.7.1
22 djangocms-picture==0.2.0
23 djangocms-snippet==1.7.1

Subscribers

People subscribed via source and target branches