# Conflicts: # app/views/users/get_user_info.json.jbuilder |
||
|---|---|---|
| .. | ||
| admins | ||
| ci/builds | ||
| projects | ||
| statistic | ||
| application_query.rb | ||
| customer_query.rb | ||
| user_query.rb | ||
# Conflicts: # app/views/users/get_user_info.json.jbuilder |
||
|---|---|---|
| .. | ||
| admins | ||
| ci/builds | ||
| projects | ||
| statistic | ||
| application_query.rb | ||
| customer_query.rb | ||
| user_query.rb | ||