← Back to branch summary

~wafaa-mohamed/pandora-image/dev

~wafaa-mohamed/pandora-image/dev

Viewing all changes in revision 4145.

Committer: Wafaa Mohamed
Date: 2014-03-18 11:20:29 UTC
mfrom: (4129.1.78 pandora)
Revision ID: wafaa.mohamed@arabdigitalexpression.org-20140318112029-49w64whuvkrdzjzu

committing change 2 fix conflict

Show diffs side-by-side

added added

removed removed

pandora/annotation/tasks.py

pandora/archive/models.py

pandora/archive/views.py

pandora/config.indiancinema.jsonc

pandora/config.padma.jsonc

pandora/config.pandora.jsonc

pandora/item/models.py

pandora/item/urls.py

pandora/item/views.py

pandora/user/migrations/0003_useragent.py

pandora/user/models.py

static/js/appearanceDialog.js

static/js/chunkupload.js

static/js/editor.js

static/js/folders.js

static/js/mainMenu.js

static/js/preferencesDialog.js

static/js/sectionButtons.js

static/js/sectionSelect.js

static/js/usersDialog.js

static/js/utils.js

vm/firstboot.sh

Older »