Merge branch '3.6-release'
[friendica-addons.git] / jappixmini / jappix / js / privacy.js
2018-03-23 FabioMerge commit '5360f08' into 3.6
2018-03-23 Tobias DiekershoffMerge branch '3.6-rc'
2018-01-20 Hypolite PetovanMerge pull request #492 from zeroadam/Addon
2018-01-20 Adam MagnessUpdate strings
2016-05-25 rabuzarusMerge branch 'master' of ../../save/merge/frio_hovercar...
2012-05-17 tony baldwinMerge remote branch 'upstream/master'
2012-05-16 MichaelMerge branch 'master' of github.com:annando/friendica...
2012-05-09 friendicaMerge https://github.com/tonybaldwin/friendica-addons...
2012-04-20 Tobias HößlMerge branch 'master' of git://github.com/friendica...
2012-04-20 fabrixxmMerge pull request #48 from Leberwurscht/master
2012-04-17 Leberwurschtjappixmini: include jappix source