LimeSurvey: master d072069f

Author Committer Branch Timestamp Parent
markusfluer markusfluer master 2016-11-30 17:48:16 master 3e7c8c93
Changeset

Revert "Revert "Merged branch master into fancytree_new""

This reverts commit cc8743996b93724f96cc3718f903d49bedd4bfb3.

mod - application/controllers/admin/limereplacementfields.php Diff File
mod - application/helpers/admin/htmleditor_helper.php Diff File
mod - application/helpers/export_helper.php Diff File
mod - application/views/admin/global_settings/_general.php Diff File
mod - application/views/admin/survey/subview/accordion/_notification_panel.php Diff File