Merge pull request #1629 from accolade/patch-1

(( 2 typos
This commit is contained in:
John McLear 2013-03-16 09:16:51 -07:00
commit d26660bce1

View file

@ -11,8 +11,8 @@ To make sure everybody is going in the same direction:
* easy to install for admins and easy to use for people * easy to install for admins and easy to use for people
* easy to integrate into other apps, but also usable as standalone * easy to integrate into other apps, but also usable as standalone
* using less resources on server side * using less resources on server side
* extensible, as much functionality should be extendable with plugins so changes don't have to be done in core * extensible, as much functionality should be extendable with plugins so changes don't have to be done in core.
Also, keep it maintainable. We don't wanna end ob as the monster Etherpad was! Also, keep it maintainable. We don't wanna end up as the monster Etherpad was!
## How to work with git? ## How to work with git?
* Don't work in your master branch. * Don't work in your master branch.