← Back to branch summary

~ubuntuone-pqm-team/gargoyle/stable

~ubuntuone-pqm-team/gargoyle/stable

Viewing all changes in revision 262.

Committer: David Cramer
Date: 2012-12-04 19:56:07 UTC
mfrom: (260.1.6)
Revision ID: git-v1:4e9bc2b901e844c6a4c64c5e265b934c30eac9cb

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

Conflicts:
setup.py

files added:
gargoyle.sublime-project

gargoyle/migrations/0003_auto__chg_field_switch_label__chg_field_switch_key.py

files modified:
.gitignore

example_project/gargoyle.db

gargoyle/manager.py

gargoyle/migrations/0001_initial.py

gargoyle/migrations/0002_auto__add_field_switch_date_modified.py

gargoyle/models.py

Show diffs side-by-side

added added

removed removed

example_project/gargoyle.db

gargoyle.sublime-project

gargoyle/manager.py

gargoyle/migrations/0001_initial.py

gargoyle/migrations/0002_auto__add_field_switch_date_modified.py

gargoyle/migrations/0003_auto__chg_field_switch_label__chg_field_switch_key.py

gargoyle/models.py

Older »