Merge lp:~popey/ubuntu-weather-app/fix-1336764 into lp:ubuntu-weather-app/obsolete.trunk

Status: Merged
Approved by: Alan Pope 🍺🐧🐱 πŸ¦„
Approved revision: 292
Merged at revision: 292
Proposed branch: lp:~popey/ubuntu-weather-app/fix-1336764
Merge into: lp:ubuntu-weather-app/obsolete.trunk
Diff against target: 22 lines (+2/-2)
2 files modified
click/apparmor.json (+1/-1)
click/manifest.json.in (+1/-1)
To merge this branch: bzr merge lp:~popey/ubuntu-weather-app/fix-1336764
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Martin Borho Approve
Review via email: mp+225310@code.launchpad.net

Commit message

bump framework

To post a comment you must log in.
Revision history for this message
Martin Borho (martin-borho) wrote :

Looks ok for me, thanks!

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'click/apparmor.json'
2--- click/apparmor.json 2014-05-02 12:52:42 +0000
3+++ click/apparmor.json 2014-07-02 12:42:23 +0000
4@@ -1,5 +1,5 @@
5 {
6 "policy_groups": ["networking"
7 ],
8- "policy_version": 1.1
9+ "policy_version": 1.2
10 }
11
12=== modified file 'click/manifest.json.in'
13--- click/manifest.json.in 2014-05-02 12:52:42 +0000
14+++ click/manifest.json.in 2014-07-02 12:42:23 +0000
15@@ -1,6 +1,6 @@
16 {
17 "description": "Weather application",
18- "framework": "ubuntu-sdk-14.04-qml-dev1",
19+ "framework": "ubuntu-sdk-14.04-qml-dev2",
20 "hooks": {
21 "@APP_NAME@": {
22 "apparmor": "apparmor.json",

Subscribers

People subscribed via source and target branches