git.koha-community.org Git - koha.git/commit

author	Chris Cormack <chris@bigballofwax.co.nz>
	Sun, 7 Jul 2013 08:38:55 +0000 (20:38 +1200)
committer	Chris Hall <followingthepath@gmail.com>
	Tue, 20 Aug 2013 09:09:50 +0000 (21:09 +1200)
commit	cdf6e36abebf4cf65df8e6ddd9aee039a43608e6
tree	f26cad9fd561394e499c845146ae3acf6bcdba25	tree \| snapshot
parent	1e9b8dedda519dafeedeb23a6d64c7225d636e7e	commit \| diff

Bug 7143: Updating history and about page

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit d647090a4ab9b53577c1959dcdb0642a29fcbe6d)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 9886445eb8e82788167ec2440dfeddf0a6b3b58d)

Conflicts:

docs/history.txt

Solved minor conflicts

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 9886445eb8e82788167ec2440dfeddf0a6b3b58d)

Conflicts:
docs/history.txt

Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit docs/history.txt)

docs/history.txt		diff \| blob \| history
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt		diff \| blob \| history