Browse Source

Merge branch 'master' of ssh://lohrun.net/~crep/songbook

Conflicts:
	templates/ancient.tmpl
	templates/patacrep-en.tmpl
	templates/patacrep.tmpl
	templates/ubuntu.tmpl
remotes/origin/translate_notes
Romain Goffe 14 years ago
parent
commit
f0aa0334ce

Diff Content Not Available