ajung/plone.app.discussion
ajung/plone.app.discussion
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allowed union merge strategy in CHANGES.rst.

Browse Source 
[ci skip]
This commit is contained in:
Maurits van Rees 2015-10-25 00:00:19 +02:00
parent e168ca18b9
commit 69cc6a7f25
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored Normal file
View File

@ -0,0 +1 @@
CHANGES.rst merge=union