LimeSurvey: develop 3ff5df21
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| develop | 2017-04-26 12:00:18 | develop 41c94934 | ||
| Changeset | Merge branch 'master' into develop Conflicts: |
|||
| mod - application/config/internal.php | Diff File | |||
| mod - application/controllers/admin/templates.php | Diff File | |||
| add - application/core/LSYii_ClientScript.php | Diff File | |||
| mod - application/views/admin/quotas/viewquotas_view.php | Diff File | |||
| mod - styles/Apple_Blossom/css/lime-admin-colors.css | Diff File | |||
| mod - styles/Bay_of_Many/css/lime-admin-colors.css | Diff File | |||
| mod - styles/Black_Pearl/css/lime-admin-colors.css | Diff File | |||
| mod - styles/Dark_Sky/css/lime-admin-colors.css | Diff File | |||
| mod - styles/Free_Magenta/css/lime-admin-colors.css | Diff File | |||
| mod - styles/Noto_All_Languages/css/lime-admin-colors.css | Diff File | |||
| mod - styles/Purple_Tentacle/css/lime-admin-colors.css | Diff File | |||
| mod - styles/Sea_Green/css/lime-admin-colors.css | Diff File | |||
| mod - styles/Sunset_Orange/css/lime-admin-colors.css | Diff File | |||
| rm - third_party/fontawesome/css/font-awesome.css.map | Diff File | |||
