2f5ce7cebe
Conflicts: app/models/ability.rb app/models/project.rb config/environments/production.rb |
||
---|---|---|
.. | ||
_flashes.html.haml | ||
_javascripts.html.haml | ||
_stylesheets.html.haml | ||
application.html.haml | ||
sessions.html.haml |