From 3b05508078f673d4278a364d17e67a63fcbb9e8c Mon Sep 17 00:00:00 2001 From: Cameron Date: Tue, 19 Apr 2016 10:32:37 -0700 Subject: [PATCH] Updated with paypal and rebase for pull-requests. --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cb0d700a3..186221350 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ## e107 [Content Management System][1] (CMS) - v2 - -[![Join the chat at https://gitter.im/e107inc/e107](https://badges.gitter.im/e107inc/e107.svg)](https://gitter.im/e107inc/e107?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) + +[![Join the chat at https://gitter.im/e107inc/e107](https://badges.gitter.im/e107inc/e107.svg)](https://gitter.im/e107inc/e107?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) ### What is e107? e107 is a free (open-source) content management system which allows you to easily manage and publish your content online. Developers can save time in building websites and powerful online applications. Users can avoid programming completely! Blogs, Websites, Intranets - e107 does it all. @@ -24,11 +24,15 @@ You may report any bugs or feature requests on GitHub (https://github.com/e107in * Please submit 1 pull-request for each Github #issue you may work on. * Make sure that only the lines you have changed actually show up in a file-comparison (diff) ie. some text-editors alter every line so this should be avoided. +* Make sure you are using rebase on your local .git/config file. +ie. [branch "master"] + rebase = true` ### Donations If you like e107 and wish to help it to improve - please consider making a small donation. Bitcoin address: 18C7W2YvkzSjvPoW1y46PjkTdCr9UzC3F7 +Paypal: donate (at) e107.org ### License