sforkowany z mirror/friendica
d489ba1510
Also removed <<<<< as this interfers (a bit) with searching for merge conflicts with a more simplier editor. Signed-off-by: Roland Häder <roland@mxchange.org> Conflicts: mod/ping.php view/lang/fr/messages.po view/lang/fr/strings.php |
||
---|---|---|
.. | ||
Chart.js-1.0.2 | ||
HTML5 | ||
Mobile_Detect | ||
Smarty | ||
Text_Highlighter | ||
colorbox | ||
cropper | ||
datetimepicker | ||
dddbl2 | ||
defuse/php-encryption-1.2.1 | ||
ezyang/htmlpurifier | ||
fullcalendar | ||
html-to-markdown | ||
jgrowl | ||
jquery-textcomplete | ||
langdet | ||
mcefixes | ||
moment | ||
oauth2-php | ||
perfect-scrollbar | ||
php-markdown | ||
phpsec | ||
spam | ||
tinymce | ||
tiptip | ||
video-js | ||
ASNValue.class.php | ||
OAuth1.php | ||
asn1.php | ||
facebook.php | ||
markdown.php | ||
oauth.php | ||
openid.php | ||
slinky.php | ||
twitteroauth.php |