diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-05-07 00:55:53 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-05-07 00:55:53 -0400 |
| commit | c36e39b18ec63dd2fe827fcb2f26ad71d2f4ed4c (patch) | |
| tree | eec4dff465ba290d39c4f0b8badc32fb6bb2f70d /view/theme/dispy/jot-header.tpl | |
| parent | b3b303f037c2142d0a388dc25b420dd1bef61eef (diff) | |
| download | volse-hubzilla-c36e39b18ec63dd2fe827fcb2f26ad71d2f4ed4c.tar.gz volse-hubzilla-c36e39b18ec63dd2fe827fcb2f26ad71d2f4ed4c.tar.bz2 volse-hubzilla-c36e39b18ec63dd2fe827fcb2f26ad71d2f4ed4c.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
I'll leave the private mail recipient autocomplete partially done. Need a good UI/JS person to finish it off.
mail autcomplete testing
email recip autocomplete
rev update
diabook-theme: small fix
diabook-theme: add "Earth Layers"-box at right_side
diabook-theme: twitterbox-bugfix
diabook: small fix
diabook-theme: bugfix
* master:
Diffstat (limited to 'view/theme/dispy/jot-header.tpl')
0 files changed, 0 insertions, 0 deletions