diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-23 09:45:40 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-23 09:45:40 -0700 |
| commit | c5d65ed62f637a91b6ea9554db57e4e74bab9cb3 (patch) | |
| tree | 77c5916fe44afc5147179abcb153ecfbd1e1804a /app/helpers | |
| parent | 81d603e2c1be5b45a623eec4f5ea9a70abcc676c (diff) | |
| parent | fee1f2e0ab0336e6746aae8e9ed76549c6ac3353 (diff) | |
| download | gitlab-ce-c5d65ed62f637a91b6ea9554db57e4e74bab9cb3.tar.gz | |
Merge branch 'userpage-activity-scroll'
Conflicts:
app/controllers/users_controller.rb
Diffstat (limited to 'app/helpers')
0 files changed, 0 insertions, 0 deletions