LimeSurvey: 2.1 9dcfe149
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| c_schmitz | c_schmitz | 2.1 | 2012-10-16 06:59:17 | 2.1 29ae6bec |
| Changeset | Merge remote-tracking branch 'origin/2.1' into 2.1 Conflicts: |
|||
| mod - application/controllers/admin/remotecontrol.php | Diff File | |||
| mod - application/controllers/admin/tokens.php | Diff File | |||
| mod - application/core/Survey_Common_Action.php | Diff File | |||
| add - application/helpers/viewHelper.php | Diff File | |||
| mod - scripts/admin/tokens.js | Diff File | |||
| mod - styles/adminstyle.css | Diff File | |||
| mod - styles/blobblueish/adminstyle.css | Diff File | |||
| mod - styles/gartergrey/adminstyle.css | Diff File | |||
| mod - styles/gringegreen/adminstyle.css | Diff File | |||
