redmatrix ea37882b95 Merge https://github.com/redmatrix/redmatrix into pending_merge ...

Conflicts:
	include/zot.php
	install/schema_mysql.sql
	install/schema_postgres.sql
	install/update.php
	mod/zfinger.php

2015-10-19 16:18:04 -07:00

..

hmessages.po

Update nl+es

2015-10-18 16:45:11 +02:00

hstrings.php

Update nl+es

2015-10-18 16:45:11 +02:00

lostpass_eml.tpl

Minor adjustment photo view + update nl (at 100\%\!)

2014-08-23 17:01:19 +00:00

messages.po

Update es+nl

2015-10-18 19:09:38 +02:00

passchanged_eml.tpl

Minor adjustment photo view + update nl (at 100\%\!)

2014-08-23 17:01:19 +00:00

register_open_eml.tpl

typo, see #884

2015-02-02 00:00:13 +01:00

register_verify_eml.tpl

Minor adjustment photo view + update nl (at 100\%\!)

2014-08-23 17:01:19 +00:00

register_verify_member.tpl

update nl

2014-09-10 14:05:12 +00:00

strings.php

Update es+nl

2015-10-18 19:09:38 +02:00

update_fail_eml.tpl

Updated Spanish and Dutch language strings

2015-10-03 15:38:40 +02:00