friendica/view
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
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
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
it IT: update to the strings 2015-10-07 06:20:54 +02:00
nb-no
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
ru
smarty3
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
.htaccess
custom_tinymce.css
default.php
global.css Redesign of the contact pages, new tab for contact statuses 2015-11-29 23:22:05 +01:00
minimal.php