Ubuntu Developer Portal

Merge lp:~developer-ubuntu-com-dev/developer-ubuntu-com/325-cms-update into lp:developer-ubuntu-com

  1. 325-cms-update
  2. Merge into stable
Proposed by Daniel Holbach on 2016-04-29
Status: Merged
Approved by: David Callé on 2016-05-04
Approved revision: 225
Merged at revision: 218
Proposed branch: lp:~developer-ubuntu-com-dev/developer-ubuntu-com/325-cms-update
Merge into: lp:developer-ubuntu-com
Prerequisite: lp:~dholbach/developer-ubuntu-com/more-and-faster-imports
Diff against target: 24 lines (+3/-2)
2 files modified
pip-cache-revno.txt (+1/-1)
requirements.txt (+2/-1)
To merge this branch: bzr merge lp:~developer-ubuntu-com-dev/developer-ubuntu-com/325-cms-update
Reviewer Review Type Date Requested Status
Ubuntu App Developer site developers 2016-04-29 Pending
Review via email: mp+293374@code.launchpad.net
To post a comment you must log in.
lp:~developer-ubuntu-com-dev/developer-ubuntu-com/325-cms-update updated on 2016-05-02
220. By Daniel Holbach on 2016-05-02

update pip-cache-revno

221. By Daniel Holbach on 2016-05-02

update pip-cache-revno to 35

222. By Daniel Holbach on 2016-05-02

update pip-cache revno to 36

223. By Daniel Holbach on 2016-05-02

bump pip cache revno

224. By David Callé on 2016-05-02

Bump pip cache revno

225. By David Callé on 2016-05-02

Bump pip cache revno

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'pip-cache-revno.txt'
2--- pip-cache-revno.txt 2016-04-18 21:52:16 +0000
3+++ pip-cache-revno.txt 2016-05-02 10:07:49 +0000
4@@ -1,1 +1,1 @@
5-33
6+39
7
8=== modified file 'requirements.txt'
9--- requirements.txt 2016-04-18 04:05:07 +0000
10+++ requirements.txt 2016-05-02 10:07:49 +0000
11@@ -16,7 +16,7 @@
12 django-ckeditor==5.0.3
13 django-ckeditor-updated==4.4.4
14 django-classy-tags==0.7.0
15-django-cms==3.2.3
16+django-cms==3.2.5
17 django-contrib-comments==1.7.0
18 django-meta==0.3.1
19 django-meta-mixin==0.2.1
20@@ -52,3 +52,4 @@
21 django-openid-auth==0.7
22 python-openid==2.2.5
23 djangorestframework==3.3.2
24+msgpack-python==0.4.7

Subscribers

People subscribed via source and target branches