Skip to content

Loging different servers same pattern#951

Merged
davivel merged 22 commits intodevelopfrom
loging_different_servers_same_pattern
Apr 22, 2015
Merged

Loging different servers same pattern#951
davivel merged 22 commits intodevelopfrom
loging_different_servers_same_pattern

Conversation

@masensio
Copy link

No description provided.

masensio and others added 21 commits April 13, 2015 13:33
…ccountManager will be done before, not after
Conflicts SOLVED in:
	src/com/owncloud/android/ui/activity/FileActivity.java
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This method is not used; remove it please.

@davivel
Copy link
Contributor

davivel commented Apr 22, 2015

👍 , waiting for Travis to merge

davivel added a commit that referenced this pull request Apr 22, 2015
…attern

Support for accounts with same user name in servers located in the same domain but different path
@davivel davivel merged commit 9b68fb6 into develop Apr 22, 2015
@davivel davivel deleted the loging_different_servers_same_pattern branch April 22, 2015 08:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants