diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-08-17 16:14:15 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-08-17 16:14:15 -0700 |
| commit | 30fd17c58dccd688e99407b8c3a7b0cf9f4fbdfe (patch) | |
| tree | 36a41c8349b4f6a48011ba070c12b397c4221a57 /include/Contact.php | |
| parent | be3a272a80182074e7417e33cc280b523779254b (diff) | |
| parent | 4ebee195cc1b5cb8e0d79bb5c58b50b271fc68a7 (diff) | |
| download | volse-hubzilla-30fd17c58dccd688e99407b8c3a7b0cf9f4fbdfe.tar.gz volse-hubzilla-30fd17c58dccd688e99407b8c3a7b0cf9f4fbdfe.tar.bz2 volse-hubzilla-30fd17c58dccd688e99407b8c3a7b0cf9f4fbdfe.zip | |
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
view/nl/messages.po
Diffstat (limited to 'include/Contact.php')
0 files changed, 0 insertions, 0 deletions