diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-15 22:01:14 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-15 22:01:14 +0100 |
| commit | 40a879fb6a3db4db302eb5113586901eb45b3279 (patch) | |
| tree | ce7c1db61f85d3980baeb7695650c7bb3f3a4f8f /app/controllers/page_controller.rb | |
| parent | 96fc4789d9991548b9fd1144f185da1f3464f156 (diff) | |
| parent | d44b8c81f939deb1e83e17d19c580b3bf6ac9ab6 (diff) | |
Merge branch 'abilities_for_gui_functions' into develop
Diffstat (limited to 'app/controllers/page_controller.rb')
0 files changed, 0 insertions, 0 deletions