summaryrefslogtreecommitdiffstats
path: root/license.txt
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2011-08-20 16:05:21 +0200
committerDerek Jones <derek.jones@ellislab.com>2011-08-20 16:05:21 +0200
commite1e828b90a1105ba375534f2accf752f3e51a678 (patch)
treeb8dd4bf18870500221e2f8ab5fec4fd19b86e594 /license.txt
parent4fbda2a8814be5837ad3928c5e3cb8506bf8ab2a (diff)
parentb8c038a3e7742f32915d7f1ab69627075e8d0c39 (diff)
Merge branch 'release/v2.0.3' into develop
Conflicts: user_guide/changelog.html
Diffstat (limited to 'license.txt')
0 files changed, 0 insertions, 0 deletions