Skip to content
Commit ce0682f0 authored by Stephane Mankowski's avatar Stephane Mankowski
Browse files

Merge branch 'master' of kde:skrooge 

Conflicts:
	doc/index.docbook
parents 1283fed9 23cfabf1
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment