Dmitriy Zaporozhets c5d65ed62f Merge branch 'userpage-activity-scroll' ...

Conflicts:
	app/controllers/users_controller.rb

2015-03-23 09:45:40 -07:00

..

images

Remove old GitLab auth image

2015-03-22 09:05:13 +01:00

javascripts

Merge branch 'userpage-activity-scroll'

2015-03-23 09:45:40 -07:00

stylesheets

Merge branch 'improve-contributions-calendar' into 'master'

2015-03-23 16:40:55 +00:00