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

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

..

redbasic

Merge remote-tracking branch 'upstream/master'

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