aboutsummaryrefslogtreecommitdiffstats
path: root/composer.lock
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-03-191-3/+2
|\
| * :arrow_up: Update bshaffer/oauth2-server-php library.Klaus Weidenbach2017-03-201-1/+57
* | new composer.lock for redzotlabs2017-03-161-0/+3633
* | could not fix the merge conflicts in composer.lock so it will need to be rege...zotlabs2017-03-151-646/+0
|\|
| * :construction_worker: :arrow_up: :heavy_plus_sign: Update PHPUnit to current ...Klaus Weidenbach2017-03-141-127/+297
* | move oauth2 to vendorzotlabs2017-03-141-2782/+69
|/
* :arrow_up: :hammer: Upgrade Markdownify library.Klaus Weidenbach2017-03-051-1/+57
* :arrow_up: :hammer: Upgrade PHP Markdown library.Klaus Weidenbach2017-02-271-0/+3303