510b0c0c50
Conflicts: app/assets/stylesheets/design/custom.scss app/models/group.rb app/models/user.rb |
||
---|---|---|
.. | ||
settings | ||
activity_feeds_helper.rb | ||
application_helper.rb | ||
build_lists_helper.rb | ||
comments_helper.rb | ||
commit_helper.rb | ||
devise_helper.rb | ||
diff_helper.rb | ||
git_helper.rb | ||
issues_helper.rb | ||
platforms_helper.rb | ||
projects_helper.rb | ||
subscribes_helper.rb | ||
users_helper.rb | ||
wiki_helper.rb |