Merge remote-tracking branch 'origin/master'

03d3eb66 · Weblate · a048c572 · 3f44ccd4 · 03d3eb66
Commit 03d3eb66 authored Aug 25, 2014 by Weblate
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

docs/admin/continuous.rst docs/admin/continuous.rst +1 -1

No files found.
--- a/docs/admin/continuous.rst
+++ b/docs/admin/continuous.rst
@@ -26,7 +26,7 @@ configuration to your :file:`.gitconfig`:
     driver = /path/to/weblate/examples/git-merge-gettext-po %O %A %B

 And enable it's use by defining proper attributes in given repository (eg. in
-:file:`.git/info/attribute`)::
+:file:`.git/info/attributes`)::

    *.po merge=merge-gettext-po