diff options
| author | tahaa karim <tahaalibra@users.noreply.github.com> | 2016-06-01 11:12:43 +0300 |
|---|---|---|
| committer | tahaa karim <tahaalibra@users.noreply.github.com> | 2016-06-01 11:12:43 +0300 |
| commit | 99a43ee48d001fd5db119392e5f9080770d01d8c (patch) | |
| tree | 8d47eed04c76fcd83d5625c72d5ce75f36970b6a /l10n | |
| parent | bec16874180ac8ee028da3844a2954bbe44c2cf1 (diff) | |
| parent | c7590d4ed7ac1204631c0498cd0219291d049b52 (diff) | |
Merge pull request #1488 from owncloud/no-more-merge-conflicts-on-changelog
Prevent merge conflicts of the changelog files
Diffstat (limited to 'l10n')
0 files changed, 0 insertions, 0 deletions