diff options
| author | zotlabs <mike@macgirvin.com> | 2017-07-05 20:52:33 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-07-05 20:52:33 -0700 |
| commit | 024d2737d001fe1bbae3b4310c7e205d2c014c6f (patch) | |
| tree | a14628c687b021a2414271fa7f607308a2682d49 /include | |
| parent | b2e5b6c977c8f8af9bfd49dac3ce41a2183025da (diff) | |
| download | volse-hubzilla-024d2737d001fe1bbae3b4310c7e205d2c014c6f.tar.gz volse-hubzilla-024d2737d001fe1bbae3b4310c7e205d2c014c6f.tar.bz2 volse-hubzilla-024d2737d001fe1bbae3b4310c7e205d2c014c6f.zip | |
there was a merge conflict in hmessages.po
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions