diff options
| author | Florian Pritz <bluewind@xinu.at> | 2013-09-22 11:16:06 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2013-09-22 11:44:42 +0200 |
| commit | f74af98b3dcc239fa442b6615a020e10c8d1a833 (patch) | |
| tree | cd38179981b767b1fc21ab901847a2c5c09f1799 /user_guide/license.html | |
| parent | 8956c3aec70ccc98ce2aa95249fc0d1c70809284 (diff) | |
| parent | 0f8312aa620ce68a81a2df2e393bb790970b917e (diff) | |
Merge tag '2.1.4'
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Conflicts:
application/config/migration.php
user_guide/changelog.html
Diffstat (limited to 'user_guide/license.html')
0 files changed, 0 insertions, 0 deletions