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
..
2015-09-26 23:44:30 -07:00
2015-09-26 23:44:30 -07:00
2015-11-28 16:26:24 +01:00
2015-11-03 11:31:19 +01:00
2015-11-28 16:23:17 +01:00
2015-05-05 03:59:51 -07:00
2015-05-05 03:59:51 -07:00
2015-09-26 23:44:30 -07:00
2015-11-20 15:18:51 +01:00
2015-11-03 11:31:19 +01:00
2015-11-28 16:23:17 +01:00
2015-11-28 16:23:17 +01:00
2015-10-01 17:51:31 +02:00
2015-11-20 15:18:51 +01:00
2015-11-27 22:45:28 +01:00
2015-09-20 22:12:00 +02:00
2015-09-26 23:44:30 -07:00
2015-09-26 23:44:30 -07:00
2015-09-26 23:44:30 -07:00
2015-11-28 16:26:24 +01:00
2015-11-28 16:26:24 +01:00
2015-06-22 00:45:29 +02:00