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.

redmatrix 76558df966 Merge branch 'master' of https://github.com/redmatrix/redmatrix ...

Conflicts:
	include/bb2diaspora.php
	include/diaspora.php
	include/enotify.php
	mod/admin.php
	mod/cloud.php
	mod/dav.php
	mod/home.php
	mod/invite.php
	mod/like.php
	mod/mitem.php
	mod/p.php
	mod/pubsites.php
	mod/setup.php
	mod/siteinfo.php
	util/messages.po

2015-05-17 19:48:57 -07:00

..

ca

updated the templates to the {{}}, compared to

2015-05-17 02:40:51 +02:00

cs

second pass name change

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

css

provide ability to create submenus

2015-05-10 15:00:18 +02:00

de

Merge branch 'master' of https://github.com/redmatrix/redmatrix

2015-05-10 13:26:44 -07:00

en

second pass name change

2015-05-05 03:59:51 -07: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

second pass name change

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

es

second pass name change

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

fr

second pass name change

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

img

get sliders working again

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

it

second pass name change

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

js

revert some changes in justified gallery

2015-04-28 22:06:09 +02:00

nb-no

second pass name change

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

nl

Dutch 100\% again

2015-05-12 23:03:13 +02:00

pdl

webpages appearence

2015-04-13 23:38:36 +02:00

php

Add sprintf.js v1.0.2.

2015-05-14 10:39:56 +02:00

pt-br

update pt-br transation

2015-05-11 09:09:29 -03:00

ru

second pass name change

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

sv

second pass name change

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

theme/redbasic

Merge branch 'master' of https://github.com/redmatrix/redmatrix

2015-05-07 16:44:28 -07:00

tpl

Merge branch 'master' of https://github.com/redmatrix/redmatrix

2015-05-10 13:26:44 -07:00

.htaccess

…