zotlabs c95e9b9ba5 could not fix the merge conflicts in composer.lock so it will need to be regenerated in the red tree. ... also the autoload_classmap is a disgrace. We provide autoload functions so that we can dynamically change the file tree without needing to regenerate a bunch of runtime stuff every time we add a file. Merge branch 'dev' into red		2017-03-15 16:09:08 -07:00
..
bin	use composer to install sabre32	2016-05-29 10:58:11 +02:00
bshaffer/oauth2-server-php	move oauth2 to vendor	2017-03-14 09:09:05 +11:00
composer	could not fix the merge conflicts in composer.lock so it will need to be regenerated in the red tree.	2017-03-15 16:09:08 -07:00
michelf/php-markdown	⬆️ 🔨 Upgrade PHP Markdown library.	2017-02-27 23:40:29 +01:00
pixel418/markdownify	⬆️ 🔨 Upgrade Markdownify library.	2017-03-05 01:14:15 +01:00
psr/log	[FEATURE] Add config and use composer autoloader.	2016-10-18 18:11:41 +02:00
sabre	[FEATURE] Add config and use composer autoloader.	2016-10-18 18:11:41 +02:00
autoload.php	move oauth2 to vendor	2017-03-14 09:09:05 +11:00