Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5

LimeSurvey · Dec 1, 2015 · f5053b5 · f5053b5
2 parents a36e65f + d9eeb7a
commit f5053b5
Showing 1 changed file with 0 additions and 10 deletions.
diff --git a/tmp/runtime/gii-1.1.15/ModelCode.php b/tmp/runtime/gii-1.1.15/ModelCode.php