diff options
| author | Andrey Andreev <narf@devilix.net> | 2018-03-22 16:00:47 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2018-03-22 16:00:47 +0100 |
| commit | c243df3af851fe90cd272f3958f7eb7bf76173b1 (patch) | |
| tree | 83e8bda62fe6c5b40b7cd93cbc6c6c3a8214cc03 /composer.json | |
| parent | f3e19ac4990e1e3fbc6964e97e7e09e506935d6e (diff) | |
| parent | 3d2073e877cb1fddbea8fcec5bc5d38b545cdcfa (diff) | |
Merge branch '3.1-stable' into develop
Conflicts resolved:
system/core/CodeIgniter.php
system/core/Security.php
system/database/DB_query_builder.php
system/libraries/Email.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 'composer.json')
0 files changed, 0 insertions, 0 deletions