app/controllers/users_controller.rb · f244914402aa6b1882671824a1a98d801cd5c45c · Forest Godfrey / gitlab-ce · GitLab

BigW Consortium Gitlab

Mar 23, 2015
c5d65ed6
Merge branch 'userpage-activity-scroll' · c5d65ed6
Dmitriy Zaporozhets authored Mar 23, 2015
```
Conflicts:
	app/controllers/users_controller.rb
```
c5d65ed6
Merge branch 'userpage-activity-scroll'
Dmitriy Zaporozhets authored Mar 23, 2015
```
Conflicts:
	app/controllers/users_controller.rb
```