LimeSurvey: 2.5 6e13155f

Author Committer Branch Timestamp Parent
ollehar ollehar 2.5 2015-12-16 15:09:29 2.5 320b7069
Changeset

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

mod - application/views/admin/labels/_labelviewrightcontent_view.php Diff File
mod - application/views/admin/labels/importlabelresources_view.php Diff File
add - upload/labels/18/.htaccess Diff File
add - upload/labels/18/.thumbs/images/Original_Nintendo_Seal_of_Quality_(European)_(Custom).JPG Diff File
add - upload/labels/18/.thumbs/images/footer-meta.png Diff File
add - upload/labels/18/images/Original_Nintendo_Seal_of_Quality_(European)_(Custom).JPG Diff File
add - upload/labels/18/images/footer-meta.png Diff File
add - upload/labels/19/.htaccess Diff File
add - upload/labels/19/.thumbs/images/Original_Nintendo_Seal_of_Quality_(European)_(Custom).JPG Diff File
add - upload/labels/19/images/Original_Nintendo_Seal_of_Quality_(European)_(Custom).JPG Diff File
add - upload/labels/20/images/Original_Nintendo_Seal_of_Quality_(European)_(Custom).JPG Diff File