Commit a149f864 authored by bmortier's avatar bmortier
Browse files

Merge branch '1.4-dev'


Signed-off-by: bmortier's avatarBenoit Mortier <benoit.mortier@fusiondirectory.org>
parents 4b52db2e b7605730
Showing with 1245 additions and 3530 deletions
+1245 -3530
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment