streams/view
friendica 196b3022bd Merge branch 'master' into movejs
Conflicts:
	version.inc
2014-01-06 02:37:06 -08:00
..
ca global rename viewcontacts to viewconnections 2013-02-19 03:00:29 -08:00
cs reset email templates to English 2013-06-16 16:49:46 -07:00
css likes to comments getting indented an extra 50px 2014-01-05 16:44:58 -08:00
de DE: update to the strings 2013-12-23 13:33:31 +01:00
en INSTALL for dummies - step 1: ensure that we throw an ugly error message in their face 2013-11-05 19:45:02 -08:00
eo reset email templates to English 2013-06-16 16:49:46 -07:00
es reset email templates to English 2013-06-16 16:49:46 -07:00
fr reset email templates to English 2013-06-16 16:49:46 -07:00
img get sliders working again 2013-01-06 15:11:31 -08:00
it Updated Italian translation 2014-01-04 11:21:33 +01:00
js Merge branch 'master' into movejs 2014-01-06 02:37:06 -08:00
nb-no reset email templates to English 2013-06-16 16:49:46 -07:00
pdl last remaining files to be Comanchified with the exception of mod_admin. Though I should probably take a third look to see if anything else uses widgets. 2013-12-22 02:16:45 -08:00
php Merge branch 'master' into movejs 2014-01-06 02:37:06 -08:00
pt-br reset email templates to English 2013-06-16 16:49:46 -07:00
ru update ru strings 2013-09-22 21:18:15 -07:00
sv reset email templates to English 2013-06-16 16:49:46 -07:00
theme/redbasic expose profile things in the UI 2013-12-30 15:41:42 -08:00
tpl Merge branch 'master' into movejs 2014-01-06 02:37:06 -08:00
.htaccess Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00