]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e2e32ee d034822)
Merge remote-tracking branch 'upstream/develop' into 1606-shared-template
authorMichael Vogel <icarus@dabo.de>
Tue, 7 Jun 2016 20:40:29 +0000 (22:40 +0200)
committerMichael Vogel <icarus@dabo.de>
Tue, 7 Jun 2016 20:40:29 +0000 (22:40 +0200)
1  2 
view/theme/frio/css/style.css patch | diff1 | diff2 | blob | history

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