Merge branch 'CC-3174' into devel

This commit is contained in:
Naomi Aro 2012-04-20 13:04:38 +02:00
commit e242972a78
4 changed files with 45 additions and 5 deletions

View file

@ -11,9 +11,9 @@ class UsersettingsController extends Zend_Controller_Action
->addActionContext('get-library-datatable', 'json')
->addActionContext('set-library-datatable', 'json')
->addActionContext('get-timeline-datatable', 'json')
->addActionContext('set-timeline-datatable', 'json')
->addActionContext('register', 'json')
->addActionContext('set-timeline-datatable', 'json')
->addActionContext('remindme', 'json')
->addActionContext('donotshowregistrationpopup', 'json')
->initContext();
}