Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

XR -> XC #114

Merged
merged 1 commit into from
Nov 24, 2016
Merged

XR -> XC #114

merged 1 commit into from
Nov 24, 2016

Conversation

andreasnuesslein
Copy link
Contributor

@andreasnuesslein andreasnuesslein commented Nov 24, 2016

No description provided.

@droidmonkey
Copy link
Member

Thanks!

@droidmonkey droidmonkey merged commit 0c40cdc into keepassxreboot:develop Nov 24, 2016
@andreasnuesslein andreasnuesslein deleted the patch-1 branch November 24, 2016 18:15
@andreasnuesslein
Copy link
Contributor Author

you're welcome :)

would you happen to have a nice solution for keepassxc in team? i.e. it's apparently not checking for merge conflicts, nor resolve them. thanks

@droidmonkey
Copy link
Member

What do you mean?

@andreasnuesslein
Copy link
Contributor Author

andreasnuesslein commented Nov 25, 2016

sorry i meant: we would like to use it in a team; i.e. synchronize it (via dropbox, owncloud, whatever) and have it open on multiple devices at once. now, if person A adds something and saves the file it gets synchronized. person B is apparently not informed about that update. if person B now changes something and saves, the new entry from person A is overridden.

@droidmonkey
Copy link
Member

This is being implemented in #93 which will be merged to develop in a couple days.

@andreasnuesslein
Copy link
Contributor Author

andreasnuesslein commented Nov 25, 2016 via email

@phoerious phoerious modified the milestone: v2.1.0 Jan 14, 2017
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.

3 participants