1
1
Fork 0
friendica_2019-12_sharedHos.../view/theme
Michael Vogel d653e27e2d Merge commit 'upstream/master'
Conflicts:

	view/theme/diabook/wall_item.tpl
	view/theme/diabook/wallwall_item.tpl
2012-03-11 20:22:28 +01:00
..
clean show experimental and unsupported theme status on theme admin page 2012-02-26 04:17:02 -08:00
darkbubble fix apps sub-menu on quattro and vier 2012-02-08 18:12:26 -08:00
darkness show experimental and unsupported theme status on theme admin page 2012-02-26 04:17:02 -08:00
darkzero Merge branch 'pull' 2012-03-05 18:52:15 -08:00
darkzero-NS show experimental and unsupported theme status on theme admin page 2012-02-26 04:17:02 -08:00
diabook Merge commit 'upstream/master' 2012-03-11 20:22:28 +01:00
diabook-blue fixed login-fields, fixed. notofication.png, changed locations 2012-03-10 13:22:41 +01:00
dispy add some '@media handheld' types for dispys 2012-03-11 10:24:49 -04:00
dispy-dark screwed up on the font-size for screen last push 2012-03-11 10:29:12 -04:00
duepuntozero some testbubble stuff 2012-03-05 15:58:26 -08:00
easterbunny show experimental and unsupported theme status on theme admin page 2012-02-26 04:17:02 -08:00
goldenrod show experimental and unsupported theme status on theme admin page 2012-02-26 04:17:02 -08:00
greenzero add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit) 2012-01-18 16:21:30 -08:00
loozah fix for comment-wwedit-wrapper CSS class in tpl had a stray $ 2012-03-02 12:00:16 -05:00
purplezero add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit) 2012-01-18 16:21:30 -08:00
quattro quattro: theme settings (a bit hackish) 2012-03-06 09:50:18 +01:00
quattro-green quattro-green: removed contact_template.tpl 2012-02-23 14:16:20 +01:00
shady show experimental and unsupported theme status on theme admin page 2012-02-26 04:17:02 -08:00
slackr slackr -> wall-to-wall comment form background different than regular comment 2012-01-26 20:32:05 -08:00
testbubble theme info file for testbubble 2012-03-08 16:30:45 -08:00
three-d add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit) 2012-01-18 16:21:30 -08:00
vier templates: fix tags 2012-03-02 12:41:34 +01:00