there was a merge conflict in hmessages.po

Browse Source

...

This commit is contained in:

zotlabs 2017-07-05 20:52:33 -07:00

parent b2e5b6c977

commit 024d2737d0

1 changed files with 4167 additions and 6372 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10539

util/hmessages.po

View File

File diff suppressed because it is too large Load Diff