diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-05-03 14:18:40 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-05-03 14:18:40 -0400 |
| commit | 4c8a82456e9f4085984573a8a226ebe3d734aa6c (patch) | |
| tree | 2f1d6384b3f68c360861715e12dcf59a48145411 /include | |
| parent | 0446766f0407b45c78031ad9e5029cc9218b025e (diff) | |
| parent | d72db2e1aa68833cbebc1c24ab4e1c6c9c966679 (diff) | |
| download | volse-hubzilla-4c8a82456e9f4085984573a8a226ebe3d734aa6c.tar.gz volse-hubzilla-4c8a82456e9f4085984573a8a226ebe3d734aa6c.tar.bz2 volse-hubzilla-4c8a82456e9f4085984573a8a226ebe3d734aa6c.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
diabook-theme: small fix
Avoid tagging both '@Robert Johnson' and also '@Robert', when '@Robert Johnson' was already matched, and '@Robert' might be somebody different entirely.
* master:
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions