← Back to branch summary

~cjohnston/summit/bzrignore

~cjohnston/summit/bzrignore

Viewing all changes in revision 141.1.1.

Committer: Chris Johnston
Date: 2011-08-12 14:25:33 UTC
mfrom: (123.2.3 bzr_apps)
mto: This revision was merged to the branch mainline in revision 142.
Revision ID: chrisjohnston@ubuntu.com-20110812142533-y9dcgoor2zn2g6d0

Removes conflicts

files added:
summit/media/jquery

summit/media/jquery-ui

summit/media/js

summit/schedule/management/commands/init-summit.py

files removed:
summit/media/twidenash.js

files modified:
.bzrignore

summit/media/css/twidenash.css

summit/schedule/templates/schedule/index.html

summit/settings.py

summit/urls.py

Show diffs side-by-side

added added

removed removed

summit/media/css/twidenash.css

summit/media/jquery-ui/

summit/media/jquery/

summit/media/js/

summit/media/twidenash.js

summit/schedule/management/commands/init-summit.py

summit/schedule/templates/schedule/index.html

summit/settings.py

Older »