bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity
friendica_2019-12_sharedHos.../view/theme/diabook-red
History
Alexander Kampmann 355c42cb30 Merge branch 'master' of https://github.com/friendica/friendica 
Conflicts:
	include/config.php
	update.php
2012-04-05 13:39:15 +02:00
..
fpostit Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
icons Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
js add themes diabook-red & diabook-aerith 2012-03-30 13:48:34 +02:00
communityhome.tpl Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
contact_template.tpl Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
directory_item.tpl Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
group_side.tpl Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
jot.tpl Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
mail_conv.tpl Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
mail_display.tpl add new messages-layout in diabook 2012-04-01 18:12:20 +02:00
mail_list.tpl add new messages-layout in diabook 2012-04-01 18:12:20 +02:00
message_side.tpl add new messages-layout in diabook 2012-04-01 18:12:20 +02:00
nav.tpl various bugfixes and css-fixes 2012-04-01 13:12:15 +02:00
photo_view.tpl Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
profile_side.tpl add themes diabook-red & diabook-aerith 2012-03-30 13:48:34 +02:00
profile_vcard.tpl diabook-themes: bugfixes / css-fixes 2012-04-02 15:06:55 +02:00
right_aside.tpl add themes diabook-red & diabook-aerith 2012-03-30 13:48:34 +02:00
rs_common_tabs.tpl Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
screenshot.png add themes diabook-red & diabook-aerith 2012-03-30 13:48:34 +02:00
search_item.tpl Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
style-network.css make right_aside translatable and provide german translation... 2012-04-03 20:59:00 +02:00
style-profile.css make right_aside translatable and provide german translation... 2012-04-03 20:59:00 +02:00
style-settings.css diabook-themes: fixed pageheader 2012-04-02 17:17:14 +02:00
style.css make right_aside translatable and provide german translation... 2012-04-03 20:59:00 +02:00
theme.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
wall_item.tpl add themes diabook-red & diabook-aerith 2012-03-30 13:48:34 +02:00
wallwall_item.tpl diabook-themes: css-fixes 2012-04-02 20:30:27 +02:00