bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity
friendica_2019-12_sharedHos.../view
History
Michael Vogel 1a170c8743 Merge remote-tracking branch 'upstream/develop' into 1512-contact-rework 
Conflicts:
	mod/contacts.php
	mod/crepair.php
2015-12-03 14:38:04 +01:00
..
bg updating the core translation 2015-03-30 09:21:01 +02:00
ca remove localized htconfig templates 2015-06-23 12:35:51 +02:00
cs CS update to the strings 2015-08-30 07:24:39 +02:00
de DE translations THX Abrax 2015-12-01 13:56:23 +01:00
eo updating the core translation 2015-03-30 09:21:01 +02:00
es DE, ES, IT: update to the translations 2015-09-01 15:12:09 +02:00
fonts updated the CSS file for the ShaShape iconset 2015-11-10 20:34:21 +01:00
fr FR update to the translations 2015-08-31 19:01:56 +02:00
install Installer use static css, fix #2071 2015-11-13 10:56:06 +01:00
is updating the core translation 2015-03-30 09:21:01 +02:00
it IT: update to the strings 2015-10-07 06:20:54 +02:00
nb-no updating the core translation 2015-03-30 09:21:01 +02:00
nl NL update to the strings, thx Ralph 2015-11-19 07:30:27 +01:00
pl PL update to the strings 2015-09-24 22:09:39 +02:00
pt-br PT-BR: update to the strings 2015-05-16 07:41:40 +02:00
ro RO: update to the strings 2015-03-05 22:48:50 +01:00
ru updating the core translation 2015-03-30 09:21:01 +02:00
smarty3 move register_adminadd_eml.tpl to view/en/ 2013-08-08 11:35:12 -04:00
sv remove localized htconfig templates 2015-06-23 12:35:51 +02:00
templates Merge remote-tracking branch 'upstream/develop' into 1512-contact-rework 2015-12-03 14:38:04 +01:00
theme Merge pull request #2131 from rabuzarus/3011_hcard_vcard 2015-12-03 14:16:52 +01:00
zh-cn CS, ZH-CN: update to the strings 2015-02-12 07:59:21 +01:00
.htaccess Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
custom_tinymce.css Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
default.php Adding metadata in the schema.org format. 2014-01-26 09:58:41 +01:00
global.css Redesign of the contact pages, new tab for contact statuses 2015-11-29 23:22:05 +01:00
minimal.php New "minimal" mode for displaying the network content. Preparation for e.g. a multicolumn layout. 2013-12-04 23:46:51 +01:00