Skip to content
Permalink
Browse files

Shuffle files around for the impending repo split.

  • Loading branch information...
markstory committed Aug 29, 2013
1 parent c6159de commit ef6f99e5ac8d30171f29cf2f84b0f71fd527714f
@@ -76,7 +76,7 @@
* assume the standard lib/Cake path.
*/
if (file_exists(dirname(__DIR__) . '/vendor/autoload.php')) {
define('CAKE_CORE_INCLUDE_PATH', dirname(__DIR__) . '/vendor/cakephp/framework');
define('CAKE_CORE_INCLUDE_PATH', dirname(__DIR__) . '/vendor/cakephp/cakephp');
} else {
define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . 'lib');
}
@@ -4,7 +4,7 @@
"homepage": "http://cakephp.org",
"license": "MIT",
"require": {
"cakephp/framework": "dev-3.0",
"cakephp/cakephp": "dev-3.0",
"php": ">=5.4"
},
"require-dev": {

This file was deleted.

Oops, something went wrong.
File renamed without changes.
@@ -25,10 +25,31 @@ And run `php composer.phar update`
Some Handy Links
----------------

* [CakePHP](http://www.cakephp.org) - The rapid development PHP framework
* [Cookbook](http://book.cakephp.org) - THE Cake user documentation; start learning here!
* [Plugins](http://plugins.cakephp.org/) - A repository of extensions to the framework
* [The Bakery](http://bakery.cakephp.org) - Tips, tutorials and articles
* [API](http://api.cakephp.org) - A reference to Cake's classes
* [CakePHP TV](http://tv.cakephp.org) - Screen casts from events and video tutorials
* [The Cake Software Foundation](http://cakefoundation.org/) - promoting development related to CakePHP
[CakePHP](http://www.cakephp.org) - The rapid development PHP framework

[Cookbook](http://book.cakephp.org) - THE Cake user documentation; start learning here!

[Plugins](http://plugins.cakephp.org/) - A repository of extensions to the framework

[The Bakery](http://bakery.cakephp.org) - Tips, tutorials and articles

[API](http://api.cakephp.org) - A reference to Cake's classes

[CakePHP TV](http://tv.cakephp.org) - Screen casts from events and video tutorials

[The Cake Software Foundation](http://cakefoundation.org/) - promoting development related to CakePHP

Get Support!
------------

[Our Google Group](https://groups.google.com/group/cake-php) - community mailing list and forum

[#cakephp](http://webchat.freenode.net/?channels=#cakephp) on irc.freenode.net - Come chat with us, we have cake.

[Q & A](http://ask.cakephp.org/) - Ask questions here, all questions welcome

[Lighthouse](https://cakephp.lighthouseapp.com/) - Got issues? Please tell us!

[![Bake Status](https://secure.travis-ci.org/cakephp/cakephp.png?branch=3.0)](http://travis-ci.org/cakephp/cakephp)

![Cake Power](https://raw.github.com/cakephp/cakephp/master/lib/Cake/Console/Templates/skel/webroot/img/cake.power.gif)
File renamed without changes.
File renamed without changes.
@@ -1,5 +1,5 @@
{
"name": "cakephp/framework",
"name": "cakephp/cakephp",
"description": "The CakePHP framework",
"type": "library",
"keywords": ["framework"],
@@ -13,7 +13,7 @@
],
"support": {
"issues": "http://cakephp.lighthouseapp.com/",
"forum": "http://ask.cakephp.org/",
"forum": "http://stackoverflow.com/tags/cakephp",
"irc": "irc://irc.freenode.org/cakephp",
"source": "https://github.com/cakephp/cakephp/"
},

0 comments on commit ef6f99e

Please sign in to comment.
You can’t perform that action at this time.