Commit graph

4 commits

Author SHA1 Message Date
redmatrix
f88dc84091 Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	view/es/htconfig.tpl
	view/es/update_fail_eml.tpl
2015-08-12 20:36:32 -07:00
jeroenpraat
4c2bbe3c41 Thanks to Manuel. Updated Spanish to 100 procent. 2015-08-12 15:11:04 +02:00
redmatrix
5b5f0666f9 second pass name change 2015-05-05 03:59:51 -07:00
friendica
99252d65bf reset email templates to English 2013-06-16 16:49:46 -07:00