Merged #177 "Disable permission checkboxes if permission is inherited"

James Moger

2014-09-11 1a44e0afdbcf3b45347c248b0b1decd5853bf69c

 src/main/java/com/gitblit/models/FederationSet.java

@@ -37,7 +37,7 @@


   /**

    * The constructor for a federation set.

    * 
    *

    * @param name

    *            the name of this federation set

    * @param tokenType