Skip to content
GitLab
Explore
Sign in
Register
Commit
2a1067b2
authored
May 19, 2014
by
kruks23
Browse files
Merge branch 'development' of
https://github.com/siacs/Conversations
into development
parents
7994b686
a6f9a742
Loading
Loading
Loading
Changes
17
Hide whitespace changes
Inline
Side-by-side
Loading
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment