diff options
| author | Andrey Andreev <narf@devilix.net> | 2016-03-11 20:04:43 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2016-03-11 20:04:43 +0100 |
| commit | a190d78a0238a0a6abd463823321bef15713e312 (patch) | |
| tree | a4e49327f8e6ca1660018cebf3b06131ae3e5faf /user_guide_src/source/general/controllers.rst | |
| parent | 3b74f57cfa6c43eab4c7cce440a454d095974a45 (diff) | |
| parent | 4f9b20ae507dda7379d392386fb7ce5702626a91 (diff) | |
Merge branch '3.0-stable' into develop
Resolved conflicts:
system/core/CodeIgniter.php
user_guide_src/source/changelog.rst
user_guide_src/source/conf.py
user_guide_src/source/installation/downloads.rst
user_guide_src/source/installation/upgrading.rst
Diffstat (limited to 'user_guide_src/source/general/controllers.rst')
0 files changed, 0 insertions, 0 deletions