Merge pull request #75 from thefake/master

James Moger

2013-02-25 9effe1630d97039b3e01cd9b58ed07e75be1d63c

 src/com/gitblit/LdapUserService.java

@@ -61,7 +61,7 @@
   @Override

   public void setup(IStoredSettings settings) {

      this.settings = settings;

      String file = settings.getString(Keys.realm.ldap.backingUserService, "users.conf");

      String file = settings.getString(Keys.realm.ldap.backingUserService, "${baseFolder}/users.conf");

      File realmFile = GitBlit.getFileOrFolder(file);



      serviceImpl = createUserService(realmFile);