]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e6a8a7c 613cf41)
Merge pull request #2035 from FlxAlbroscheit/develop
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Sun, 8 Nov 2015 15:03:04 +0000 (16:03 +0100)
committerTobias Diekershoff <tobias.diekershoff@gmx.net>
Sun, 8 Nov 2015 15:03:04 +0000 (16:03 +0100)
Preview the last 5 conversations in message-sidebar

1  2 
view/theme/duepuntozero/style.css patch | diff1 | diff2 | blob | history
view/theme/frost/style.css patch | diff1 | diff2 | blob | history

diff --cc view/theme/duepuntozero/style.css
Simple merge
diff --cc view/theme/frost/style.css
Simple merge
Unnamed repository; edit this file 'description' to name the repository.