From 1fb09594248b643211947786fbf58024fcbb8f8f Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 14 Feb 2016 23:19:23 +0200 Subject: [PATCH 1/2] Updated readme --- readme.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/readme.md b/readme.md index f3a3e1515174..0e2ce989ff04 100644 --- a/readme.md +++ b/readme.md @@ -54,6 +54,9 @@ There are two options: * [Support Forum](https://www.invoiceninja.com/forums/forum/support/) * [Feature Roadmap](https://trello.com/b/63BbiVVe/) +### Pull Requests +We're using the [git-flow](http://nvie.com/posts/a-successful-git-branching-model/) model of branching and releasing, **please create pull requests against the develop branch**. + ### Contributors * [Troels Liebe Bentsen](https://github.com/tlbdk) * [Jeramy Simpson](https://github.com/JeramyMywork) - [MyWork](https://www.mywork.com.au) From 907ab8f0e845cb641f99a73c6e33488ee99b7279 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 14 Feb 2016 23:23:01 +0200 Subject: [PATCH 2/2] Bumped version number to 2.5.0.1 --- app/Http/routes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/routes.php b/app/Http/routes.php index 18654d64b1a7..9001c18e6256 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -509,7 +509,7 @@ if (!defined('CONTACT_EMAIL')) { define('NINJA_GATEWAY_CONFIG', 'NINJA_GATEWAY_CONFIG'); define('NINJA_WEB_URL', 'https://www.invoiceninja.com'); define('NINJA_APP_URL', 'https://app.invoiceninja.com'); - define('NINJA_VERSION', '2.5.0'); + define('NINJA_VERSION', '2.5.0.1'); define('NINJA_DATE', '2000-01-01'); define('SOCIAL_LINK_FACEBOOK', 'https://www.facebook.com/invoiceninja');