diff options
| author | intrigeri <intrigeri@boum.org> | 2010-06-29 15:53:51 +0200 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2010-06-29 15:53:51 +0200 |
| commit | 1786b106a9c7f448136ff47d9b6dd26d48a5dd2e (patch) | |
| tree | edfeed77be4a56ed06095bd67eb7cbc05a1a1eca /.gitattributes | |
| parent | b225fdc44d4b3d2853db622d59aed7b59788aeec (diff) | |
| parent | be60d261e6cbee094e4df74e1bb24c8ad3dc393d (diff) | |
| download | ikiwiki-1786b106a9c7f448136ff47d9b6dd26d48a5dd2e.tar ikiwiki-1786b106a9c7f448136ff47d9b6dd26d48a5dd2e.tar.gz | |
Merge remote branch 'upstream/master' into prv/po
Conflicts:
doc/plugins/po.mdwn
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..5d425843f --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +debian/changelog merge=dpkg-mergechangelogs |