Skip to content
Snippets Groups Projects
Commit 5a7ad574 authored by Laurent's avatar Laurent
Browse files

Merge branch 'hotline-master'

Conflicts:
	library/Class/Bib.php
parents af767422 5facbd06
1 merge request!1659Master
Showing
with 134 additions and 103 deletions
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