LimeSurvey: develop 5493359a

Author Committer Branch Timestamp Parent
markusfluer markusfluer develop 2017-10-20 12:39:20 develop 9d211dbe
Changeset

Fixed issues: Removed critical merge conflicts

mod - application/models/Permission.php Diff File
mod - application/models/SurveyDynamic.php Diff File
mod - application/views/admin/survey/subview/accordion/_notification_panel.php Diff File
mod - application/views/admin/survey/surveybar_view.php Diff File