diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-16 22:58:28 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-16 22:58:28 -0400 |
| commit | 4e967fc79ffec8219a89a04f4e47fdc6662a7b08 (patch) | |
| tree | c1a231e0d0a90f21d216d4ae554b51f547f93ea4 /view/theme/dispy/jot-header.tpl | |
| parent | f08844a8a58f46d539753831a8ff99995fc3c1ae (diff) | |
| download | volse-hubzilla-4e967fc79ffec8219a89a04f4e47fdc6662a7b08.tar.gz volse-hubzilla-4e967fc79ffec8219a89a04f4e47fdc6662a7b08.tar.bz2 volse-hubzilla-4e967fc79ffec8219a89a04f4e47fdc6662a7b08.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: (22 commits)
diabook-themes: bugfix (sry, necessary)
diabook-themes: small bug/css-fixes ---> ver. 1.019
diabook-themes: bug-fixes
diabook-themes: minor bugfixes
turn on comment edit
propagate edited comments
edited comments weren't being relayed
rev update
diabook-themes: css-fixes
open contact edit in same window
where did this "lang" string come from and why?
function name typo
track requested profile error msg
DBA: Reverting back to original source
DBA: Nothing really done ..
DBA: Deactivation of the mysqli-class for testing purposes.
API: Improved the timeline. Several (disabled) tests with caching of photos.
html2plain: changed behaviour for the "hr" element.
API: Tweetdeck is now working
API: Added Public Timeline
...
* master:
Diffstat (limited to 'view/theme/dispy/jot-header.tpl')
0 files changed, 0 insertions, 0 deletions