app/assets/stylesheets/gitlab_bootstrap · b8c3f9a628d6830282743b4b419aaf4c37e060e9 · Forest Godfrey / gitlab-ce

Merge branch 'master' into 6-0-dev · f438bd41

authored Jun 30, 2013

Conflicts:
	app/controllers/admin/teams/projects_controller.rb
	app/views/team_members/_team_member.html.haml
	app/views/teams/members/_member.html.haml

f438bd41

Name	Last commit	Last update
..
avatar.scss		Loading commit data...
blocks.scss		Loading commit data...
buttons.scss		Loading commit data...
common.scss		Loading commit data...
files.scss		Loading commit data...
fonts.scss		Loading commit data...
lists.scss		Loading commit data...
mixins.scss		Loading commit data...
nav.scss		Loading commit data...
tables.scss		Loading commit data...
typography.scss		Loading commit data...
variables.scss		Loading commit data...