Commit Graph

2 Commits

Author SHA1 Message Date
Alfredo Sumaran 7b6fe0e259 Merge remote-tracking branch 'origin/master' into label-dropdown-fix
# Conflicts:
#	app/views/shared/issuable/_sidebar.html.haml
2016-04-20 11:40:55 -05:00
Alfredo Sumaran e784958cb5 Move shared html to a partial 2016-04-18 14:56:02 -05:00