LimeSurvey: master aef089b3

Diff Back to Repository
Author Committer Branch Timestamp Parent
Shitiz Garg Shitiz Garg master 2012-01-30 05:47:56 master 7262e16b
Changeset

Merge branch 'refs/heads/limesurvey16'

Conflicts:
admin/admin.php
admin/browse.php
admin/conditions.php
admin/dataentry.php
admin/html.php
admin/login_check.php
admin/questionhandling.php
admin/scripts/tabpane/css/tab.webfx.css
admin/styles/default/adminstyle.css
admin/styles/limesurvey/adminstyle.css
admin/userrighthandling.php
admin/vvexport.php
common.php
group.php
index.php
locale/es/LC_MESSAGES/es.mo
locale/es/LC_MESSAGES/es.po
qanda.php
question.php
survey.php
add - admin/scripts/tabpane/css/tab.webfx.css Diff File
add - admin/styles/classic/adminstyle.css Diff File
add - admin/styles/limesurvey/adminstyle.css Diff File
mod - admin/admin.php Diff File
mod - admin/browse.php Diff File
mod - admin/conditions.php Diff File
mod - admin/dataentry.php Diff File
mod - admin/html.php Diff File
mod - admin/login_check.php Diff File
mod - admin/questionhandling.php Diff File
mod - admin/styles/default/adminstyle.css Diff File
mod - admin/userrighthandling.php Diff File
mod - admin/vvexport.php Diff File
mod - common.php Diff File
mod - group.php Diff File
mod - index.php Diff File
mod - locale/es/LC_MESSAGES/es.po Diff File
mod - qanda.php Diff File
mod - question.php Diff File
mod - survey.php Diff File