Roland Häder
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 | ||
| colorbox | ||
| cropper | ||
| datetimepicker | ||
| dddbl2 | ||
| defuse/php-encryption-1.2.1 | ||
| ezyang/htmlpurifier | ||
| fullcalendar | ||
| html-to-markdown | ||
| HTML5 | ||
| jgrowl | ||
| jquery-textcomplete | ||
| langdet | ||
| mcefixes | ||
| Mobile_Detect | ||
| moment | ||
| oauth2-php | ||
| perfect-scrollbar | ||
| php-markdown | ||
| phpsec | ||
| Smarty | ||
| spam | ||
| Text_Highlighter | ||
| tinymce | ||
| tiptip | ||
| video-js | ||
| asn1.php | ||
| ASNValue.class.php | ||
| facebook.php | ||
| markdown.php | ||
| oauth.php | ||
| OAuth1.php | ||
| openid.php | ||
| slinky.php | ||
| twitteroauth.php | ||