Commit Graph

5 Commits

Author SHA1 Message Date
Josh Soref f26d2d6eec spelling: encryption
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
2023-03-26 16:03:23 -04:00
Josh Soref f83fb1deb7 spelling: addresses
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
2023-03-26 16:03:22 -04:00
Josh Soref 07862b8a88 spelling: activity
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
2023-03-26 16:03:22 -04:00
Alexander Kampmann 355c42cb30 Merge branch 'master' of https://github.com/friendica/friendica
Conflicts:
	include/config.php
	update.php
2012-04-05 13:39:15 +02:00
friendica 0e3b9097f6 spec directory 2012-03-09 19:50:31 -08:00