search

Novator / Pandora

P2P Social Network
Other
147 stars 32 forks source link

merge master to develop #17

Closed EPashkin closed 9 years ago

EPashkin commented 9 years ago

Copy changes from master to develop without git.sh. Made for separate git.sh version in dev and master and possibility for automerging back without manually change git.sh on master

EPashkin commented 9 years ago

Russian text: После принятия этого PR и аналогичного ручного обратного мерж будет автоматическим без необходимости править git.sh (сохранятся раскомментированные git push -u github master).

PS. Если больше не нужно пушить в gitorious, то скажи до мержа и я обновлю этот PR

EPashkin commented 9 years ago

Was wrong, different version git.sh can be done only when always merge from dev to master. This PR allow automatic merge back to master For different version needed manual commit back to master without changes git.sh

EPashkin commented 9 years ago

Already merged, close