Merge branch 'master' of git://git.immerda.ch/amnesia
Conflicts: wiki/src/doc/first_steps/persistence/configure.fr.po
Rakefile
0 → 100644
This diff is collapsed.
This diff is collapsed.
File moved
Please register or sign in to comment