Skip to content

Conversation

@schiessle
Copy link
Member

@schiessle schiessle added the 3. to review Waiting for reviews label Jun 20, 2016
@MorrisJobke
Copy link
Member

In #162 I changed the sentences that the federation isn't bound to our server anymore, because we also welcome 3rdparty implementations (like pydio) to federate with us :)

@schiessle
Copy link
Member Author

at the moment you can't add a pydio as trusted server. But you will get a error message anyway, so it should be ok

@vincchan
Copy link
Member

vincchan commented Jun 20, 2016

LGTM

1 similar comment
@LukasReschke
Copy link
Member

LGTM

@LukasReschke
Copy link
Member

Conflicts. Yay ;)

@MorrisJobke
Copy link
Member

This is superseeded by #162 (comment) for master (also see the comment there).

But @schiessle and I agreed on doing only a stupid search and replace (like in this PR) for stable9 to keep the existing translations.

I will close this now, because @schiessle is already working on the port of this to stable9 (cherry-picking doesn't work because of changed translations around the changed lines).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to review Waiting for reviews

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants