search

consultingwerk / proparse

Proparse, forked from http://www.oehive.org/proparse/
Other
18 stars 9 forks source link

integrate Gilles changes after merge with upstream #4

Closed akera-io closed 8 years ago

akera-io commented 8 years ago

Hi Mike,

did merge back to upstream and that should be able to go as fast-forward with no conflicts... let me know if you have any issues.

mikefechner commented 8 years ago

Looking good so far :-)

akera-io commented 8 years ago

you should get ready for the finale or you just don’t want to see the french again so soon? :)

Marian Edu

Acorn IT www.acorn-it.comhttp://www.acorn-it.com www.akera.iohttp://www.akera.io +40 740 036 212

On 10 Jul 2016, at 20:53, Mike Fechner notifications@github.com<mailto:notifications@github.com> wrote:

Looking good so far :-)

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHubhttps://github.com/consultingwerk/proparse/pull/4#issuecomment-231601729, or mute the threadhttps://github.com/notifications/unsubscribe/AOgnoJEEjUZCixyGSis3uRd4OuK0O8FPks5qUTGmgaJpZM4JCPnw.

mikefechner commented 8 years ago

Watching in parallel ;-)

Von: Akera [mailto:notifications@github.com] Gesendet: Sonntag, 10. Juli 2016 19:56 An: consultingwerk/proparse proparse@noreply.github.com Cc: Mike Fechner mike.fechner@consultingwerk.de; State change state_change@noreply.github.com Betreff: Re: [consultingwerk/proparse] integrate Gilles changes after merge with upstream (#4)

you should get ready for the finale or you just don’t want to see the french again so soon? :)

Marian Edu

Acorn IT www.acorn-it.comhttp://www.acorn-it.comhttp://www.acorn-it.com%3chttp:/www.acorn-it.com www.akera.iohttp://www.akera.iohttp://www.akera.io%3chttp:/www.akera.io +40 740 036 212

On 10 Jul 2016, at 20:53, Mike Fechner notifications@github.com<mailto:notifications@github.com<mailto:notifications@github.com%3cmailto:notifications@github.com>> wrote:

Looking good so far :-)

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHubhttps://github.com/consultingwerk/proparse/pull/4#issuecomment-231601729, or mute the threadhttps://github.com/notifications/unsubscribe/AOgnoJEEjUZCixyGSis3uRd4OuK0O8FPks5qUTGmgaJpZM4JCPnw.

— You are receiving this because you modified the open/close state. Reply to this email directly, view it on GitHubhttps://github.com/consultingwerk/proparse/pull/4#issuecomment-231601866, or mute the threadhttps://github.com/notifications/unsubscribe/AMm7E33DMqqATnVuyi5Tquo1r3xPrAmfks5qUTI5gaJpZM4JCPnw.