Michael 2a56370cf4 Merge remote-tracking branch 'upstream/develop' into annando/issue8514		2020-05-18 21:38:17 +00:00
..
fonts
install
js	Move perfect-scrollbar dependency back to composer.json	2020-05-06 21:49:34 -04:00
lang	Regenerate master messages.po	2020-04-05 11:12:41 -04:00
php	Add license info at Friendica PHP files	2020-02-09 16:18:46 +01:00
smarty3
templates	Issue 8514: Make paging for searcg items work again	2020-05-17 13:51:56 +00:00
theme	Merge remote-tracking branch 'upstream/develop' into annando/issue8514	2020-05-18 21:38:17 +00:00
.htaccess
global.css	Move poke module to src/	2020-04-20 11:47:08 -04:00