LimeSurvey: develop 8396f379

Author Committer Branch Timestamp Parent
TonisOrmisson TonisOrmisson develop 2017-11-08 16:11:38 develop d2659a80
Changeset

Merge remote-tracking branch 'upstream/develop' into fix-tests-cleanup

mod - .travis.yml Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/views/admin/expressions/test/survey_logic_file.php Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/hu/hu.mo Diff File
mod - locale/pl/pl.mo Diff File
mod - templates/default/views/subviews/head.twig Diff File
mod - templates/material/views/subviews/head.twig Diff File
mod - templates/monochrome/views/subviews/head.twig Diff File
mod - templates/no_bootstrap/views/subviews/head.twig Diff File
mod - templates/vanilla/views/subviews/head.twig Diff File
mod - tests/data/views/adminBaseViews.php Diff File