LimeSurvey: master d58f936b

Author Committer Branch Timestamp Parent
ollehar ollehar master 2016-03-16 13:02 master 536c4b7e
Changeset

Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey

mod - application/views/admin/htmleditor/pop_editor_view.php Diff File
mod - application/views/admin/limeReplacementFields_view.php Diff File
mod - application/views/admin/survey/prepareEditorScript_view.php Diff File
mod - scripts/admin/limereplacementfields/dialogs/limereplacementfields.js Diff File
mod - third_party/ckeditor/skins/BootstrapCK-Skin/dialog.css Diff File
mod - third_party/ckeditor/skins/BootstrapCK-Skin/editor.css Diff File