lp:~wesmason/gargoyle/merge-0.10.10

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~ubuntuone-pqm-team/gargoyle/stable at revision 267

Ricardo Kirkner (community): Approve on 2014-07-22

Diff: 103 lines (+25/-5)

5 files modified

gargoyle/builtins.py (+9/-1)
gargoyle/conditions.py (+3/-0)
gargoyle/nexus_modules.py (+4/-1)
setup.py (+1/-1)
tests/tests.py (+8/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

267. By Wes Mason on 2014-06-20

Merge upstream gargoyle 0.10.10

266. By Ricardo Kirkner on 2013-06-03

merge trunk@276 (0.10.8)

265. By Ricardo Kirkner on 2013-05-16

make gargoyle work with django 1.5

264. By Ricardo Kirkner on 2013-05-16

merge trunk@270 (0.10.7)

263. By David Cramer on 2012-12-04

0.10.6

262. By David Cramer on 2012-12-04

Merge branch 'master' of github.com:disqus/gargoyle

Conflicts:
 setup.py

261. By David Cramer on 2012-12-04

Relax modeldict requirement

260. By David Cramer on 2012-09-13

Bump modeldict requirement

259. By David Cramer on 2012-08-29

Merge pull request #33 from passy/patch-1

Removed redundant backtick from Switch Inheritance documentation

258. By David Cramer on 2012-08-29

Merge pull request #47 from streeter/master

Add support for Django 1.4 timezone aware datetimes