Skip to content

Commit

Permalink
Merge branch 'master' of git://github.com/shripchenko/opensips into s…
Browse files Browse the repository at this point in the history 
…hripchenko-master

Conflicts:
	modules/load_balancer/lb_data.c
  • Loading branch information
@bogdan-iancu
bogdan-iancu committed Jan 22, 2015
2 parents 2fdeba6 + f457334 commit 02a2025
Show file tree
Hide file tree
Showing 3 changed files with 735 additions and 264 deletions.

0 comments on commit 02a2025

Please sign in to comment.