Skip to content
Snippets Groups Projects
Commit 218342d1 authored by Loïc Faure-Lacroix's avatar Loïc Faure-Lacroix
Browse files

Merge branch 'master' of git+ssh://repos-sflphone-git@sflphone.org/~/sflphone 

Conflicts:

	www/include/header.php
parents 2a08db21 227fb4a6
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment