mirror of
https://github.com/friendica/friendica
synced 2024-12-23 14:40:16 +00:00
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:
This commit is contained in:
parent
b3b303f037
commit
c36e39b18e