LimeSurvey: 2.5 614afa0f

Author Committer Branch Timestamp Parent
ollehar ollehar 2.5 2015-12-16 09:35:07 2.5 2b34de02
Changeset

Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5

mod - application/controllers/admin/tokens.php Diff File
mod - application/views/admin/participants/attributeControl_view.php Diff File
mod - application/views/admin/participants/participantsPanel_view.php Diff File
mod - application/views/admin/templates/templateeditorbar_view.php Diff File
mod - application/views/admin/templates/templatesummary_view.php Diff File
mod - application/views/admin/token/bounce.php Diff File
mod - application/views/admin/token/exportdialog.php Diff File
mod - styles/Sea_Green/css/.sass-cache/b8ed5539e8363b254e7afde4b3c4cf41319c881d/lime-admin.scssc Diff File
mod - styles/Sea_Green/css/lime-admin.css Diff File
mod - styles/Sea_Green/css/lime-admin.css.map Diff File
mod - styles/Sea_Green/css/lime-admin.scss Diff File