M M Arif
|
62a5452437
|
Merge branch 'master' of gitea.com:mmarif/GitNex
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/java/org/mian/gitnex/adapters/AdminGetUsersAdapter.java
# app/src/main/java/org/mian/gitnex/adapters/CollaboratorsAdapter.java
# app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java
# app/src/main/java/org/mian/gitnex/adapters/MembersByOrgAdapter.java
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
# app/src/main/java/org/mian/gitnex/adapters/OrganizationsListAdapter.java
# app/src/main/java/org/mian/gitnex/adapters/ProfileFollowersAdapter.java
# app/src/main/java/org/mian/gitnex/adapters/ProfileFollowingAdapter.java
# app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
# app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java
# app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java
# app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java
# app/src/main/java/org/mian/gitnex/adapters/UserSearchAdapter.java
# app/src/main/java/org/mian/gitnex/fragments/OrganizationInfoFragment.java
# app/src/main/java/org/mian/gitnex/fragments/ProfileFragment.java
# app/src/main/res/layout/activity_issue_detail.xml
# app/src/main/res/layout/admin_users_list.xml
# app/src/main/res/layout/fragment_profile.xml
# app/src/main/res/layout/issue_comments.xml
# app/src/main/res/layout/my_repos_list.xml
# app/src/main/res/layout/nav_header.xml
# app/src/main/res/layout/organizations_list.xml
# app/src/main/res/layout/profile_followers_list.xml
# app/src/main/res/layout/profile_following_list.xml
# app/src/main/res/layout/repos_list.xml
# app/src/main/res/layout/repositories_by_org_list.xml
# app/src/main/res/layout/starred_repos_list.xml
|
2019-10-01 10:14:45 +05:00 |
|