diff options
| author | Michael <icarus@dabo.de> | 2012-02-19 20:09:42 +0100 |
|---|---|---|
| committer | Michael <icarus@dabo.de> | 2012-02-19 20:09:42 +0100 |
| commit | cafd4003522a472d2709569ea5eb5f80b817af23 (patch) | |
| tree | bbd512126515afc929de06dce79ba847b9681092 /doc/developer | |
| parent | 73e0e4d78341cb96ef9665a0ee4fb7e7ee2a701f (diff) | |
| parent | a9ed5915cebcf51347acaad51d0c252e57bceaff (diff) | |
| download | volse-hubzilla-cafd4003522a472d2709569ea5eb5f80b817af23.tar.gz volse-hubzilla-cafd4003522a472d2709569ea5eb5f80b817af23.tar.bz2 volse-hubzilla-cafd4003522a472d2709569ea5eb5f80b817af23.zip | |
Merge remote branch 'upstream/master'
Conflicts:
view/theme/vier/style.css
Diffstat (limited to 'doc/developer')
| -rwxr-xr-x | doc/developer | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/doc/developer b/doc/developer deleted file mode 100755 index dd8b316ea..000000000 --- a/doc/developer +++ /dev/null @@ -1,18 +0,0 @@ -Friendica Developer Guide - -Here is how you can join us. - -First, get yourself a working git package on the system where you will be -doing development. - -Create your own github account. - -Follow the instructions provided here: [[http://help.github.com/fork-a-repo/]] -to create and use your own tracking fork on github - -Then go to your github page and create a "Pull request" when you are ready -to notify us to merge your work. - -**Important** - -Please pull in any changes from the project repository and merge them with your work **before** issuing a pull request. We reserve the right to reject any patch which results in a large number of merge conflicts. This is especially true in the case of language translations - where we may not be able to understand the subtle differences between conflicting versions.
\ No newline at end of file |