diff options
author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-26 16:18:06 +0100 |
---|---|---|
committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-26 16:18:06 +0100 |
commit | ab2bf212ed91b1e9359f026ef8775de2238a49be (patch) | |
tree | 564867b6d12e5cc4ca03d37cf64ea381d3eba967 /app/models/group_permission.rb | |
parent | 36919fb419a40688daa97e36734f579488cb56e2 (diff) | |
parent | df0bc9db9cdbf9bfbc92a5f1f00e57fc0e7d7792 (diff) |
Merge branch 'search' into develop
Diffstat (limited to 'app/models/group_permission.rb')
0 files changed, 0 insertions, 0 deletions