Merge remote-tracking branch 'tomzx/b551_hardcoded_french_string'
Conflicts: app/views/wiki/annotate.rhtml app/views/wiki/diff.rhtml app/views/wiki/show.rhtml
Showing
Please
register
or
sign in
to comment
Conflicts: app/views/wiki/annotate.rhtml app/views/wiki/diff.rhtml app/views/wiki/show.rhtml