This repository has been archived on 2024-08-19. You can view files and clone it, but cannot push or open issues or pull requests.

Haakon Meland Eriksen 17907f11a3 Merge remote-tracking branch 'upstream/master' ...

Conflicts:
	include/datetime.php
	include/text.php
	mod/events.php
	version.inc
	view/css/mod_events.css
	view/theme/redbasic/css/style.css
	view/tpl/event_head.tpl
	view/tpl/events-js.tpl
	view/tpl/jot.tpl

2015-11-28 16:26:24 +01:00

..

ca

move string files to hmessages.po and hstrings.php for hubzilla to avoid endless merge conflicts.

2015-09-26 23:44:30 -07:00

cs

move string files to hmessages.po and hstrings.php for hubzilla to avoid endless merge conflicts.

2015-09-26 23:44:30 -07:00

css

Merge remote-tracking branch 'upstream/master'

2015-11-28 16:26:24 +01:00

de

Some small rebranding for Hubzilla transition from Red Matrix

2015-11-03 11:31:19 +01:00

en

Removed my version of jot.tpl

2015-11-28 16:23:17 +01:00

en-au

second pass name change

2015-05-05 03:59:51 -07:00

en-gb

second pass name change

2015-05-05 03:59:51 -07:00

eo

move string files to hmessages.po and hstrings.php for hubzilla to avoid endless merge conflicts.

2015-09-26 23:44:30 -07:00

es

update es+nl

2015-11-20 15:18:51 +01:00

fr

Some small rebranding for Hubzilla transition from Red Matrix

2015-11-03 11:31:19 +01:00

img

get sliders working again

2013-01-06 15:11:31 -08:00

it

Removed my version of jot.tpl

2015-11-28 16:23:17 +01:00

js

Removed my version of jot.tpl

2015-11-28 16:23:17 +01:00

nb-no

Updated Norwegian strings for Hubzilla

2015-10-01 17:51:31 +02:00

nl

update es+nl

2015-11-20 15:18:51 +01:00

pdl

move events tools to aside widget

2015-11-27 22:45:28 +01:00

php

kick right aside out a little earlier

2015-09-20 22:12:00 +02:00

pt-br

move string files to hmessages.po and hstrings.php for hubzilla to avoid endless merge conflicts.

2015-09-26 23:44:30 -07:00

ru

move string files to hmessages.po and hstrings.php for hubzilla to avoid endless merge conflicts.

2015-09-26 23:44:30 -07:00

sv

move string files to hmessages.po and hstrings.php for hubzilla to avoid endless merge conflicts.

2015-09-26 23:44:30 -07:00

theme/redbasic

Merge remote-tracking branch 'upstream/master'

2015-11-28 16:26:24 +01:00

tpl

Merge remote-tracking branch 'upstream/master'

2015-11-28 16:26:24 +01:00

.htaccess

Compatible update for .htaccess.

2015-06-22 00:45:29 +02:00