summaryrefslogtreecommitdiffstats
path: root/application/core
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2011-08-20 15:57:14 +0200
committerDerek Jones <derek.jones@ellislab.com>2011-08-20 15:57:14 +0200
commitb8c038a3e7742f32915d7f1ab69627075e8d0c39 (patch)
tree809872634daf234591fabacbca8df2203d35b509 /application/core
parent4c76272593d82f45761c24917e69b42983f26171 (diff)
updated version number in user guide, removed some stray merge markers found in the change log
Diffstat (limited to 'application/core')
0 files changed, 0 insertions, 0 deletions