diff --git a/cmd/serve.go b/cmd/serve.go index 9638da8ba..ec1da3bee 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -146,12 +146,12 @@ func runServ(c *cli.Context) { fail("Key permission denied", "Cannot push with deployment key: %d", key.ID) } // Check if this deploy key belongs to current repository. - if !models.HasDeployKey(key.ID, repo.Id) { - fail("Key access denied", "Key access denied: %d-%d", key.ID, repo.Id) + if !models.HasDeployKey(key.ID, repo.ID) { + fail("Key access denied", "Key access denied: %d-%d", key.ID, repo.ID) } // Update deploy key activity. - deployKey, err := models.GetDeployKeyByRepo(key.ID, repo.Id) + deployKey, err := models.GetDeployKeyByRepo(key.ID, repo.ID) if err != nil { fail("Internal error", "GetDeployKey: %v", err) } diff --git a/cmd/web.go b/cmd/web.go index 850dc84b5..2c931a59b 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -449,6 +449,8 @@ func runWeb(ctx *cli.Context) { m.Get("/edit/:tagname", repo.EditRelease) m.Post("/edit/:tagname", bindIgnErr(auth.EditReleaseForm{}), repo.EditReleasePost) }, reqRepoAdmin, middleware.RepoRef()) + + m.Combo("/compare/*").Get(repo.CompareAndPullRequest) }, reqSignIn, middleware.RepoAssignment(true)) m.Group("/:username/:reponame", func() { @@ -469,7 +471,7 @@ func runWeb(ctx *cli.Context) { m.Get("/commit/*", repo.Diff) }, middleware.RepoRef()) - m.Get("/compare/:before([a-z0-9]+)...:after([a-z0-9]+)", repo.CompareDiff) + m.Get("/compare/:before([a-z0-9]{40})...:after([a-z0-9]{40})", repo.CompareDiff) }, ignSignIn, middleware.RepoAssignment(true)) m.Group("/:username", func() { diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini index e93de4aa9..e110719f7 100644 --- a/conf/locale/locale_en-US.ini +++ b/conf/locale/locale_en-US.ini @@ -395,6 +395,9 @@ issues.label_deletion = Label Deletion issues.label_deletion_desc = Delete this label will remove its information in all related issues. Do you want to continue? issues.label_deletion_success = Label has been deleted successfully! +pulls.compare_changes = Compare Changes +pulls.compare_changes_desc = Compare two branches and make a pull request for changes. + milestones.new = New Milestone milestones.open_tab = %d Open milestones.close_tab = %d Closed diff --git a/models/access.go b/models/access.go index 54d0f099c..8d698f151 100644 --- a/models/access.go +++ b/models/access.go @@ -37,11 +37,11 @@ func accessLevel(e Engine, u *User, repo *Repository) (AccessMode, error) { } if u != nil { - if u.Id == repo.OwnerId { + if u.Id == repo.OwnerID { return ACCESS_MODE_OWNER, nil } - a := &Access{UserID: u.Id, RepoID: repo.Id} + a := &Access{UserID: u.Id, RepoID: repo.ID} if has, err := e.Get(a); !has || err != nil { return mode, err } @@ -77,7 +77,7 @@ func (u *User) GetAccessibleRepositories() (map[*Repository]AccessMode, error) { repos := make(map[*Repository]AccessMode, len(accesses)) for _, access := range accesses { - repo, err := GetRepositoryById(access.RepoID) + repo, err := GetRepositoryByID(access.RepoID) if err != nil { if IsErrRepoNotExist(err) { log.Error(4, "%v", err) @@ -87,7 +87,7 @@ func (u *User) GetAccessibleRepositories() (map[*Repository]AccessMode, error) { } if err = repo.GetOwner(); err != nil { return nil, err - } else if repo.OwnerId == u.Id { + } else if repo.OwnerID == u.Id { continue } repos[repo] = access.Mode @@ -121,13 +121,13 @@ func (repo *Repository) refreshAccesses(e Engine, accessMap map[int64]AccessMode } newAccesses = append(newAccesses, Access{ UserID: userID, - RepoID: repo.Id, + RepoID: repo.ID, Mode: mode, }) } // Delete old accesses and insert new ones for repository. - if _, err = e.Delete(&Access{RepoID: repo.Id}); err != nil { + if _, err = e.Delete(&Access{RepoID: repo.ID}); err != nil { return fmt.Errorf("delete old accesses: %v", err) } else if _, err = e.Insert(newAccesses); err != nil { return fmt.Errorf("insert new accesses: %v", err) @@ -193,7 +193,7 @@ func (repo *Repository) recalculateTeamAccesses(e Engine, ignTeamID int64) (err // have relations with repository. if t.IsOwnerTeam() { t.Authorize = ACCESS_MODE_OWNER - } else if !t.hasRepository(e, repo.Id) { + } else if !t.hasRepository(e, repo.ID) { continue } diff --git a/models/action.go b/models/action.go index 99cd17091..4069cbca6 100644 --- a/models/action.go +++ b/models/action.go @@ -348,7 +348,7 @@ func CommitRepoAction(userId, repoUserId int64, userName, actEmail string, // check if repo belongs to org and append additional webhooks if repo.Owner.IsOrganization() { // get hooks for org - orgws, err := GetActiveWebhooksByOrgId(repo.OwnerId) + orgws, err := GetActiveWebhooksByOrgId(repo.OwnerID) if err != nil { return errors.New("GetActiveWebhooksByOrgId: " + err.Error()) } @@ -388,7 +388,7 @@ func CommitRepoAction(userId, repoUserId int64, userName, actEmail string, Ref: refFullName, Commits: commits, Repo: &PayloadRepo{ - Id: repo.Id, + Id: repo.ID, Name: repo.LowerName, Url: repoLink, Description: repo.Description, @@ -431,7 +431,7 @@ func CommitRepoAction(userId, repoUserId int64, userName, actEmail string, } if err = CreateHookTask(&HookTask{ - RepoID: repo.Id, + RepoID: repo.ID, HookID: w.Id, Type: w.HookTaskType, Url: w.Url, @@ -453,12 +453,12 @@ func newRepoAction(e Engine, u *User, repo *Repository) (err error) { ActUserName: u.Name, ActEmail: u.Email, OpType: CREATE_REPO, - RepoID: repo.Id, + RepoID: repo.ID, RepoUserName: repo.Owner.Name, RepoName: repo.Name, IsPrivate: repo.IsPrivate, }); err != nil { - return fmt.Errorf("notify watchers '%d/%s'", u.Id, repo.Id) + return fmt.Errorf("notify watchers '%d/%s'", u.Id, repo.ID) } log.Trace("action.NewRepoAction: %s/%s", u.Name, repo.Name) @@ -476,19 +476,19 @@ func transferRepoAction(e Engine, actUser, oldOwner, newOwner *User, repo *Repos ActUserName: actUser.Name, ActEmail: actUser.Email, OpType: TRANSFER_REPO, - RepoID: repo.Id, + RepoID: repo.ID, RepoUserName: newOwner.Name, RepoName: repo.Name, IsPrivate: repo.IsPrivate, Content: path.Join(oldOwner.LowerName, repo.LowerName), } if err = notifyWatchers(e, action); err != nil { - return fmt.Errorf("notify watchers '%d/%s'", actUser.Id, repo.Id) + return fmt.Errorf("notify watchers '%d/%s'", actUser.Id, repo.ID) } // Remove watch for organization. if repo.Owner.IsOrganization() { - if err = watchRepo(e, repo.Owner.Id, repo.Id, false); err != nil { + if err = watchRepo(e, repo.Owner.Id, repo.ID, false); err != nil { return fmt.Errorf("watch repository: %v", err) } } diff --git a/models/issue.go b/models/issue.go index d423f0562..6617bd053 100644 --- a/models/issue.go +++ b/models/issue.go @@ -68,7 +68,7 @@ func (i *Issue) AfterSet(colName string, _ xorm.Cell) { } func (i *Issue) GetPoster() (err error) { - i.Poster, err = GetUserById(i.PosterID) + i.Poster, err = GetUserByID(i.PosterID) if IsErrUserNotExist(err) { i.Poster = &User{Name: "FakeUser"} return nil @@ -104,7 +104,7 @@ func (i *Issue) GetAssignee() (err error) { return nil } - i.Assignee, err = GetUserById(i.AssigneeID) + i.Assignee, err = GetUserByID(i.AssigneeID) if IsErrUserNotExist(err) { return nil } @@ -170,7 +170,7 @@ func GetIssueByRef(ref string) (issue *Issue, err error) { return } - return GetIssueByIndex(repo.Id, issueNumber) + return GetIssueByIndex(repo.ID, issueNumber) } // GetIssueByIndex returns issue by given index in repository. @@ -304,7 +304,7 @@ func NewIssueUserPairs(repo *Repository, issueID, orgID, posterID, assigneeID in iu := &IssueUser{ IssueId: issueID, - RepoId: repo.Id, + RepoId: repo.ID, } isNeedAddPoster := true @@ -331,9 +331,9 @@ func NewIssueUserPairs(repo *Repository, issueID, orgID, posterID, assigneeID in } // Add owner's as well. - if repo.OwnerId != posterID { + if repo.OwnerID != posterID { iu.Id = 0 - iu.Uid = repo.OwnerId + iu.Uid = repo.OwnerID iu.IsAssigned = iu.Uid == assigneeID if _, err = x.Insert(iu); err != nil { return err @@ -760,7 +760,7 @@ func MilestoneStats(repoID int64) (open int64, closed int64) { // ChangeMilestoneStatus changes the milestone open/closed status. func ChangeMilestoneStatus(m *Milestone, isClosed bool) (err error) { - repo, err := GetRepositoryById(m.RepoID) + repo, err := GetRepositoryByID(m.RepoID) if err != nil { return err } @@ -776,9 +776,9 @@ func ChangeMilestoneStatus(m *Milestone, isClosed bool) (err error) { return err } - repo.NumMilestones = int(countRepoMilestones(sess, repo.Id)) - repo.NumClosedMilestones = int(countRepoClosedMilestones(sess, repo.Id)) - if _, err = sess.Id(repo.Id).AllCols().Update(repo); err != nil { + repo.NumMilestones = int(countRepoMilestones(sess, repo.ID)) + repo.NumClosedMilestones = int(countRepoClosedMilestones(sess, repo.ID)) + if _, err = sess.Id(repo.ID).AllCols().Update(repo); err != nil { return err } return sess.Commit() @@ -886,7 +886,7 @@ func DeleteMilestoneByID(mid int64) error { return err } - repo, err := GetRepositoryById(m.RepoID) + repo, err := GetRepositoryByID(m.RepoID) if err != nil { return err } @@ -901,9 +901,9 @@ func DeleteMilestoneByID(mid int64) error { return err } - repo.NumMilestones = int(countRepoMilestones(sess, repo.Id)) - repo.NumClosedMilestones = int(countRepoClosedMilestones(sess, repo.Id)) - if _, err = sess.Id(repo.Id).AllCols().Update(repo); err != nil { + repo.NumMilestones = int(countRepoMilestones(sess, repo.ID)) + repo.NumClosedMilestones = int(countRepoClosedMilestones(sess, repo.ID)) + if _, err = sess.Id(repo.ID).AllCols().Update(repo); err != nil { return err } diff --git a/models/oauth2.go b/models/oauth2.go index d19e248c1..a15f7b6f3 100644 --- a/models/oauth2.go +++ b/models/oauth2.go @@ -58,7 +58,7 @@ func GetOauth2(identity string) (oa *Oauth2, err error) { } else if oa.Uid == -1 { return oa, ErrOauth2NotAssociated } - oa.User, err = GetUserById(oa.Uid) + oa.User, err = GetUserByID(oa.Uid) return oa, err } diff --git a/models/org.go b/models/org.go index 3caed30ba..b8d194567 100644 --- a/models/org.go +++ b/models/org.go @@ -66,7 +66,7 @@ func (org *User) GetMembers() error { org.Members = make([]*User, len(ous)) for i, ou := range ous { - org.Members[i], err = GetUserById(ou.Uid) + org.Members[i], err = GetUserByID(ou.Uid) if err != nil { return err } @@ -343,11 +343,11 @@ func RemoveOrgUser(orgId, uid int64) error { return nil } - u, err := GetUserById(uid) + u, err := GetUserByID(uid) if err != nil { return fmt.Errorf("GetUserById: %v", err) } - org, err := GetUserById(orgId) + org, err := GetUserByID(orgId) if err != nil { return fmt.Errorf("get organization: %v", err) } else if err = org.GetRepositories(); err != nil { @@ -380,10 +380,10 @@ func RemoveOrgUser(orgId, uid int64) error { // Delete all repository accesses. access := &Access{UserID: u.Id} for _, repo := range org.Repos { - access.RepoID = repo.Id + access.RepoID = repo.ID if _, err = sess.Delete(access); err != nil { return err - } else if err = watchRepo(sess, u.Id, repo.Id, false); err != nil { + } else if err = watchRepo(sess, u.Id, repo.ID, false); err != nil { return err } } @@ -443,7 +443,7 @@ func (t *Team) getRepositories(e Engine) (err error) { t.Repos = make([]*Repository, 0, len(teamRepos)) for i := range teamRepos { - repo, err := getRepositoryById(e, teamRepos[i].RepoID) + repo, err := getRepositoryByID(e, teamRepos[i].RepoID) if err != nil { return fmt.Errorf("getRepositoryById(%d): %v", teamRepos[i].RepoID, err) } @@ -487,7 +487,7 @@ func (t *Team) HasRepository(repoID int64) bool { } func (t *Team) addRepository(e Engine, repo *Repository) (err error) { - if err = addTeamRepo(e, t.OrgID, t.ID, repo.Id); err != nil { + if err = addTeamRepo(e, t.OrgID, t.ID, repo.ID); err != nil { return err } @@ -504,7 +504,7 @@ func (t *Team) addRepository(e Engine, repo *Repository) (err error) { return fmt.Errorf("getMembers: %v", err) } for _, u := range t.Members { - if err = watchRepo(e, u.Id, repo.Id, true); err != nil { + if err = watchRepo(e, u.Id, repo.ID, true); err != nil { return fmt.Errorf("watchRepo: %v", err) } } @@ -513,9 +513,9 @@ func (t *Team) addRepository(e Engine, repo *Repository) (err error) { // AddRepository adds new repository to team of organization. func (t *Team) AddRepository(repo *Repository) (err error) { - if repo.OwnerId != t.OrgID { + if repo.OwnerID != t.OrgID { return errors.New("Repository does not belong to organization") - } else if t.HasRepository(repo.Id) { + } else if t.HasRepository(repo.ID) { return nil } @@ -533,7 +533,7 @@ func (t *Team) AddRepository(repo *Repository) (err error) { } func (t *Team) removeRepository(e Engine, repo *Repository, recalculate bool) (err error) { - if err = removeTeamRepo(e, t.ID, repo.Id); err != nil { + if err = removeTeamRepo(e, t.ID, repo.ID); err != nil { return err } @@ -560,7 +560,7 @@ func (t *Team) removeRepository(e Engine, repo *Repository, recalculate bool) (e continue } - if err = watchRepo(e, u.Id, repo.Id, false); err != nil { + if err = watchRepo(e, u.Id, repo.ID, false); err != nil { return err } } @@ -574,7 +574,7 @@ func (t *Team) RemoveRepository(repoID int64) error { return nil } - repo, err := GetRepositoryById(repoID) + repo, err := GetRepositoryByID(repoID) if err != nil { return err } @@ -713,7 +713,7 @@ func DeleteTeam(t *Team) error { } // Get organization. - org, err := GetUserById(t.OrgID) + org, err := GetUserByID(t.OrgID) if err != nil { return err } @@ -903,7 +903,7 @@ func removeTeamMember(e Engine, orgId, teamId, uid int64) error { } // Get organization. - org, err := getUserById(e, orgId) + org, err := getUserByID(e, orgId) if err != nil { return err } diff --git a/models/repo.go b/models/repo.go index 8135bc57d..7355b5e8d 100644 --- a/models/repo.go +++ b/models/repo.go @@ -129,8 +129,8 @@ func NewRepoContext() { // Repository represents a git repository. type Repository struct { - Id int64 - OwnerId int64 `xorm:"UNIQUE(s)"` + ID int64 `xorm:"pk autoincr"` + OwnerID int64 `xorm:"UNIQUE(s)"` Owner *User `xorm:"-"` LowerName string `xorm:"UNIQUE(s) INDEX NOT NULL"` Name string `xorm:"INDEX NOT NULL"` @@ -159,8 +159,8 @@ type Repository struct { *Mirror `xorm:"-"` IsFork bool `xorm:"NOT NULL DEFAULT false"` - ForkId int64 - ForkRepo *Repository `xorm:"-"` + ForkID int64 + BaseRepo *Repository `xorm:"-"` Created time.Time `xorm:"CREATED"` Updated time.Time `xorm:"UPDATED"` @@ -168,7 +168,7 @@ type Repository struct { func (repo *Repository) getOwner(e Engine) (err error) { if repo.Owner == nil { - repo.Owner, err = getUserById(e, repo.OwnerId) + repo.Owner, err = getUserByID(e, repo.OwnerID) } return err } @@ -178,16 +178,16 @@ func (repo *Repository) GetOwner() (err error) { } func (repo *Repository) GetMirror() (err error) { - repo.Mirror, err = GetMirror(repo.Id) + repo.Mirror, err = GetMirror(repo.ID) return err } -func (repo *Repository) GetForkRepo() (err error) { +func (repo *Repository) GetBaseRepo() (err error) { if !repo.IsFork { return nil } - repo.ForkRepo, err = GetRepositoryById(repo.ForkId) + repo.BaseRepo, err = GetRepositoryByID(repo.ForkID) return err } @@ -211,7 +211,7 @@ func (repo *Repository) HasAccess(u *User) bool { } func (repo *Repository) IsOwnedBy(u *User) bool { - return repo.OwnerId == u.Id + return repo.OwnerID == u.Id } // DescriptionHtml does special handles to description and return HTML string. @@ -224,7 +224,7 @@ func (repo *Repository) DescriptionHtml() template.HTML { func isRepositoryExist(e Engine, u *User, repoName string) (bool, error) { has, err := e.Get(&Repository{ - OwnerId: u.Id, + OwnerID: u.Id, LowerName: strings.ToLower(repoName), }) return has && com.IsDir(RepoPath(u.Name, repoName)), err @@ -287,8 +287,8 @@ func IsUsableName(name string) error { // Mirror represents a mirror information of repository. type Mirror struct { - Id int64 - RepoId int64 + ID int64 `xorm:"pk autoincr"` + RepoID int64 RepoName string // / Interval int // Hour. Updated time.Time `xorm:"UPDATED"` @@ -296,7 +296,7 @@ type Mirror struct { } func getMirror(e Engine, repoId int64) (*Mirror, error) { - m := &Mirror{RepoId: repoId} + m := &Mirror{RepoID: repoId} has, err := e.Get(m) if err != nil { return nil, err @@ -312,7 +312,7 @@ func GetMirror(repoId int64) (*Mirror, error) { } func updateMirror(e Engine, m *Mirror) error { - _, err := e.Id(m.Id).Update(m) + _, err := e.Id(m.ID).Update(m) return err } @@ -330,7 +330,7 @@ func MirrorRepository(repoId int64, userName, repoName, repoPath, url string) er } if _, err = x.InsertOne(&Mirror{ - RepoId: repoId, + RepoID: repoId, RepoName: strings.ToLower(userName + "/" + repoName), Interval: 24, NextUpdate: time.Now().Add(24 * time.Hour), @@ -365,7 +365,7 @@ func MigrateRepository(u *User, name, desc string, private, mirror bool, url str repo.IsBare = false if mirror { - if err = MirrorRepository(repo.Id, u.Name, repo.Name, repoPath, url); err != nil { + if err = MirrorRepository(repo.ID, u.Name, repo.Name, repoPath, url); err != nil { return repo, err } repo.IsMirror = true @@ -517,7 +517,7 @@ func initRepository(e Engine, repoPath string, u *User, repo *Repository, initRe if len(fileName) == 0 { // Re-fetch the repository from database before updating it (else it would // override changes that were done earlier with sql) - if repo, err = getRepositoryById(e, repo.Id); err != nil { + if repo, err = getRepositoryByID(e, repo.ID); err != nil { return err } repo.IsBare = true @@ -562,7 +562,7 @@ func createRepository(e *xorm.Session, u *User, repo *Repository) (err error) { } } - if err = watchRepo(e, u.Id, repo.Id, true); err != nil { + if err = watchRepo(e, u.Id, repo.ID, true); err != nil { return fmt.Errorf("watchRepo: %v", err) } else if err = newRepoAction(e, u, repo); err != nil { return fmt.Errorf("newRepoAction: %v", err) @@ -574,7 +574,7 @@ func createRepository(e *xorm.Session, u *User, repo *Repository) (err error) { // CreateRepository creates a repository for given user or organization. func CreateRepository(u *User, name, desc, lang, license string, isPrivate, isMirror, initReadme bool) (_ *Repository, err error) { repo := &Repository{ - OwnerId: u.Id, + OwnerID: u.Id, Owner: u, Name: name, LowerName: strings.ToLower(name), @@ -630,12 +630,12 @@ func GetRepositoriesWithUsers(num, offset int) ([]*Repository, error) { } for _, repo := range repos { - repo.Owner = &User{Id: repo.OwnerId} + repo.Owner = &User{Id: repo.OwnerID} has, err := x.Get(repo.Owner) if err != nil { return nil, err } else if !has { - return nil, ErrUserNotExist{repo.OwnerId, ""} + return nil, ErrUserNotExist{repo.OwnerID, ""} } } @@ -672,11 +672,11 @@ func TransferOwnership(u *User, newOwnerName string, repo *Repository) error { // Note: we have to set value here to make sure recalculate accesses is based on // new owner. - repo.OwnerId = newOwner.Id + repo.OwnerID = newOwner.Id repo.Owner = newOwner // Update repository. - if _, err := sess.Id(repo.Id).Update(repo); err != nil { + if _, err := sess.Id(repo.ID).Update(repo); err != nil { return fmt.Errorf("update owner: %v", err) } @@ -687,7 +687,7 @@ func TransferOwnership(u *User, newOwnerName string, repo *Repository) error { } // Dummy object. - collaboration := &Collaboration{RepoID: repo.Id} + collaboration := &Collaboration{RepoID: repo.ID} for _, c := range collaborators { collaboration.UserID = c.Id if c.Id == newOwner.Id || newOwner.IsOrgMember(c.Id) { @@ -703,7 +703,7 @@ func TransferOwnership(u *User, newOwnerName string, repo *Repository) error { return fmt.Errorf("getTeams: %v", err) } for _, t := range owner.Teams { - if !t.hasRepository(sess, repo.Id) { + if !t.hasRepository(sess, repo.ID) { continue } @@ -713,7 +713,7 @@ func TransferOwnership(u *User, newOwnerName string, repo *Repository) error { } } - if err = owner.removeOrgRepo(sess, repo.Id); err != nil { + if err = owner.removeOrgRepo(sess, repo.ID); err != nil { return fmt.Errorf("removeOrgRepo: %v", err) } } @@ -739,7 +739,7 @@ func TransferOwnership(u *User, newOwnerName string, repo *Repository) error { return fmt.Errorf("decrease old owner repository count: %v", err) } - if err = watchRepo(sess, newOwner.Id, repo.Id, true); err != nil { + if err = watchRepo(sess, newOwner.Id, repo.ID, true); err != nil { return fmt.Errorf("watchRepo: %v", err) } else if err = transferRepoAction(sess, u, owner, newOwner, repo); err != nil { return fmt.Errorf("transferRepoAction: %v", err) @@ -747,7 +747,7 @@ func TransferOwnership(u *User, newOwnerName string, repo *Repository) error { // Update mirror information. if repo.IsMirror { - mirror, err := getMirror(sess, repo.Id) + mirror, err := getMirror(sess, repo.ID) if err != nil { return fmt.Errorf("getMirror: %v", err) } @@ -794,7 +794,7 @@ func updateRepository(e Engine, repo *Repository, visibilityChanged bool) (err e repo.Website = repo.Website[:255] } - if _, err = e.Id(repo.Id).AllCols().Update(repo); err != nil { + if _, err = e.Id(repo.ID).AllCols().Update(repo); err != nil { return fmt.Errorf("update: %v", err) } @@ -831,7 +831,7 @@ func UpdateRepository(repo *Repository, visibilityChanged bool) (err error) { // DeleteRepository deletes a repository for a user or organization. func DeleteRepository(uid, repoID int64, userName string) error { - repo := &Repository{Id: repoID, OwnerId: uid} + repo := &Repository{ID: repoID, OwnerID: uid} has, err := x.Get(repo) if err != nil { return err @@ -840,7 +840,7 @@ func DeleteRepository(uid, repoID int64, userName string) error { } // In case is a organization. - org, err := GetUserById(uid) + org, err := GetUserByID(uid) if err != nil { return err } @@ -866,15 +866,15 @@ func DeleteRepository(uid, repoID int64, userName string) error { } } - if _, err = sess.Delete(&Repository{Id: repoID}); err != nil { + if _, err = sess.Delete(&Repository{ID: repoID}); err != nil { return err - } else if _, err = sess.Delete(&Access{RepoID: repo.Id}); err != nil { + } else if _, err = sess.Delete(&Access{RepoID: repo.ID}); err != nil { return err - } else if _, err = sess.Delete(&Action{RepoID: repo.Id}); err != nil { + } else if _, err = sess.Delete(&Action{RepoID: repo.ID}); err != nil { return err } else if _, err = sess.Delete(&Watch{RepoID: repoID}); err != nil { return err - } else if _, err = sess.Delete(&Mirror{RepoId: repoID}); err != nil { + } else if _, err = sess.Delete(&Mirror{RepoID: repoID}); err != nil { return err } else if _, err = sess.Delete(&IssueUser{RepoId: repoID}); err != nil { return err @@ -902,7 +902,7 @@ func DeleteRepository(uid, repoID int64, userName string) error { } if repo.IsFork { - if _, err = sess.Exec("UPDATE `repository` SET num_forks=num_forks-1 WHERE id=?", repo.ForkId); err != nil { + if _, err = sess.Exec("UPDATE `repository` SET num_forks=num_forks-1 WHERE id=?", repo.ForkID); err != nil { return err } } @@ -946,7 +946,7 @@ func GetRepositoryByRef(ref string) (*Repository, error) { // GetRepositoryByName returns the repository by given name under user if exists. func GetRepositoryByName(uid int64, repoName string) (*Repository, error) { repo := &Repository{ - OwnerId: uid, + OwnerID: uid, LowerName: strings.ToLower(repoName), } has, err := x.Get(repo) @@ -958,7 +958,7 @@ func GetRepositoryByName(uid int64, repoName string) (*Repository, error) { return repo, err } -func getRepositoryById(e Engine, id int64) (*Repository, error) { +func getRepositoryByID(e Engine, id int64) (*Repository, error) { repo := new(Repository) has, err := e.Id(id).Get(repo) if err != nil { @@ -969,9 +969,9 @@ func getRepositoryById(e Engine, id int64) (*Repository, error) { return repo, nil } -// GetRepositoryById returns the repository by given id if exists. -func GetRepositoryById(id int64) (*Repository, error) { - return getRepositoryById(x, id) +// GetRepositoryByID returns the repository by given id if exists. +func GetRepositoryByID(id int64) (*Repository, error) { + return getRepositoryByID(x, id) } // GetRepositories returns a list of repositories of given user. @@ -982,8 +982,7 @@ func GetRepositories(uid int64, private bool) ([]*Repository, error) { sess.Where("is_private=?", false) } - err := sess.Find(&repos, &Repository{OwnerId: uid}) - return repos, err + return repos, sess.Find(&repos, &Repository{OwnerID: uid}) } // GetRecentUpdatedRepositories returns the list of repositories that are recently updated. @@ -993,8 +992,8 @@ func GetRecentUpdatedRepositories(num int) (repos []*Repository, err error) { } // GetRepositoryCount returns the total number of repositories of user. -func GetRepositoryCount(user *User) (int64, error) { - return x.Count(&Repository{OwnerId: user.Id}) +func GetRepositoryCount(u *User) (int64, error) { + return x.Count(&Repository{OwnerID: u.Id}) } type SearchOption struct { @@ -1199,7 +1198,7 @@ type Collaboration struct { // Add collaborator and accompanying access func (repo *Repository) AddCollaborator(u *User) error { collaboration := &Collaboration{ - RepoID: repo.Id, + RepoID: repo.ID, UserID: u.Id, } @@ -1238,13 +1237,13 @@ func (repo *Repository) AddCollaborator(u *User) error { func (repo *Repository) getCollaborators(e Engine) ([]*User, error) { collaborations := make([]*Collaboration, 0) - if err := e.Find(&collaborations, &Collaboration{RepoID: repo.Id}); err != nil { + if err := e.Find(&collaborations, &Collaboration{RepoID: repo.ID}); err != nil { return nil, err } users := make([]*User, len(collaborations)) for i, c := range collaborations { - user, err := getUserById(e, c.UserID) + user, err := getUserByID(e, c.UserID) if err != nil { return nil, err } @@ -1261,7 +1260,7 @@ func (repo *Repository) GetCollaborators() ([]*User, error) { // Delete collaborator and accompanying access func (repo *Repository) DeleteCollaborator(u *User) (err error) { collaboration := &Collaboration{ - RepoID: repo.Id, + RepoID: repo.ID, UserID: u.Id, } @@ -1430,14 +1429,14 @@ func HasForkedRepo(ownerID, repoID int64) (*Repository, bool) { func ForkRepository(u *User, oldRepo *Repository, name, desc string) (_ *Repository, err error) { repo := &Repository{ - OwnerId: u.Id, + OwnerID: u.Id, Owner: u, Name: name, LowerName: strings.ToLower(name), Description: desc, IsPrivate: oldRepo.IsPrivate, IsFork: true, - ForkId: oldRepo.Id, + ForkID: oldRepo.ID, } sess := x.NewSession() @@ -1450,7 +1449,7 @@ func ForkRepository(u *User, oldRepo *Repository, name, desc string) (_ *Reposit return nil, err } - if _, err = sess.Exec("UPDATE `repository` SET num_forks=num_forks+1 WHERE id=?", oldRepo.Id); err != nil { + if _, err = sess.Exec("UPDATE `repository` SET num_forks=num_forks+1 WHERE id=?", oldRepo.ID); err != nil { return nil, err } diff --git a/models/update.go b/models/update.go index 33b7733e1..f381d6fd0 100644 --- a/models/update.go +++ b/models/update.go @@ -105,7 +105,7 @@ func Update(refName, oldCommitId, newCommitId, userName, repoUserName, repoName commit := &base.PushCommits{} if err = CommitRepoAction(userId, ru.Id, userName, actEmail, - repos.Id, repoUserName, repoName, refName, commit, oldCommitId, newCommitId); err != nil { + repos.ID, repoUserName, repoName, refName, commit, oldCommitId, newCommitId); err != nil { log.GitLogger.Fatal(4, "CommitRepoAction: %s/%s:%v", repoUserName, repoName, err) } return err @@ -154,7 +154,7 @@ func Update(refName, oldCommitId, newCommitId, userName, repoUserName, repoName } if err = CommitRepoAction(userId, ru.Id, userName, actEmail, - repos.Id, repoUserName, repoName, refName, &base.PushCommits{l.Len(), commits, ""}, oldCommitId, newCommitId); err != nil { + repos.ID, repoUserName, repoName, refName, &base.PushCommits{l.Len(), commits, ""}, oldCommitId, newCommitId); err != nil { return fmt.Errorf("runUpdate.models.CommitRepoAction: %s/%s:%v", repoUserName, repoName, err) } return nil diff --git a/models/user.go b/models/user.go index 6dd31536f..3100a45ad 100644 --- a/models/user.go +++ b/models/user.go @@ -226,7 +226,7 @@ func (u *User) GetOrganizations() error { u.Orgs = make([]*User, len(ous)) for i, ou := range ous { - u.Orgs[i], err = GetUserById(ou.OrgID) + u.Orgs[i], err = GetUserByID(ou.OrgID) if err != nil { return err } @@ -555,7 +555,7 @@ func GetUserByKeyId(keyId int64) (*User, error) { return user, nil } -func getUserById(e Engine, id int64) (*User, error) { +func getUserByID(e Engine, id int64) (*User, error) { u := new(User) has, err := e.Id(id).Get(u) if err != nil { @@ -566,9 +566,9 @@ func getUserById(e Engine, id int64) (*User, error) { return u, nil } -// GetUserById returns the user object by given ID if exists. -func GetUserById(id int64) (*User, error) { - return getUserById(x, id) +// GetUserByID returns the user object by given ID if exists. +func GetUserByID(id int64) (*User, error) { + return getUserByID(x, id) } // GetUserByName returns user by given name. @@ -620,7 +620,7 @@ func GetEmailAddresses(uid int64) ([]*EmailAddress, error) { return nil, err } - u, err := GetUserById(uid) + u, err := GetUserByID(uid) if err != nil { return nil, err } @@ -666,7 +666,7 @@ func (email *EmailAddress) Activate() error { return err } - if user, err := GetUserById(email.Uid); err != nil { + if user, err := GetUserByID(email.Uid); err != nil { return err } else { user.Rands = GetUserSalt() @@ -793,7 +793,7 @@ func GetUserByEmail(email string) (*User, error) { return nil, err } if has { - return GetUserById(emailAddress.Uid) + return GetUserByID(emailAddress.Uid) } return nil, ErrUserNotExist{0, "email"} diff --git a/modules/auth/auth.go b/modules/auth/auth.go index 7e01abc3b..92bcd7208 100644 --- a/modules/auth/auth.go +++ b/modules/auth/auth.go @@ -54,7 +54,7 @@ func SignedInId(req *http.Request, sess session.Store) int64 { return 0 } if id, ok := uid.(int64); ok { - if _, err := models.GetUserById(id); err != nil { + if _, err := models.GetUserByID(id); err != nil { if !models.IsErrUserNotExist(err) { log.Error(4, "GetUserById: %v", err) } @@ -127,7 +127,7 @@ func SignedInUser(req *http.Request, sess session.Store) (*models.User, bool) { return nil, false } - u, err := models.GetUserById(uid) + u, err := models.GetUserByID(uid) if err != nil { log.Error(4, "GetUserById: %v", err) return nil, false diff --git a/modules/bindata/bindata.go b/modules/bindata/bindata.go index 35dab2e82..ac08f1d97 100644 --- a/modules/bindata/bindata.go +++ b/modules/bindata/bindata.go @@ -772,7 +772,7 @@ func confLocaleLocale_deDeIni() (*asset, error) { return a, nil } -var _confLocaleLocale_enUsIni = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xc4\x7d\xeb\x72\xdc\x46\xb2\xe6\x7f\x3c\x05\xac\x0d\xad\xec\x08\xaa\x15\xb6\x63\x2f\xe1\x90\xe4\xa5\x49\xeb\x32\x47\x14\x75\x44\x6a\x66\x67\x15\x0a\x0c\xba\x01\x76\x63\xd4\x0d\xb4\x71\x61\x9b\xf3\x6b\x5f\x63\x5f\x6f\x9f\x64\x33\xbf\xcc\xac\x0b\x80\xa6\xe4\x39\x27\xf6\xfc\x21\xab\xab\xb2\x6e\x59\x59\x59\x79\xab\x42\xbe\xdf\x67\x45\xd9\xad\xd2\x67\xe9\x69\xba\xcf\xab\x7a\x5b\x76\x5d\xda\x95\xdb\x9b\xc7\x9b\xa6\xeb\xcb\x22\x7d\x59\xf5\xf4\xbb\xbd\xad\x56\x65\x92\x6c\x9a\x5d\x49\xa0\xaf\xe8\x5f\x52\xe4\xdd\x66\xd9\xe4\x6d\x41\x19\xe7\x96\x4e\xca\xdf\xf7\xdb\xa6\x65\xa0\x5f\x25\x95\x6c\xca\xed\x9e\xeb\xd0\xbf\xa4\xab\xd6\x75\x56\xd5\xf4\xf3\x8a\x52\xe9\xeb\x3a\xe9\x9a\x55\x95\x6f\xb3\xa0\x00\x19\x56\xfe\x53\xfa\x43\x5d\xa4\x57\x7d\xb9\x4f\x9f\x76\xbb\x7c\xbb\x7d\x9e\x77\xa8\xd2\x97\x69\xbe\x5a\x35\x43\xdd\x3f\x7d\x22\x05\xd2\x78\x33\xf4\xd6\xfa\xe5\xd0\x4b\xde\xb0\xb7\xac\x0f\xfb\xa4\x2d\xd7\x15\x4d\xac\xa5\xac\xf7\x9a\x4c\x0e\xe5\xb2\xab\x7a\x1e\xf4\x5f\x24\x95\xdc\x96\x6d\x57\x35\x3c\x9e\x3f\x4b\x2a\xd9\xe7\x6b\x06\x78\x47\xff\x92\xbe\xdc\xed\xb7\x39\x2a\x5c\x6b\x32\xd9\xe6\xf5\x7a\x10\x98\x37\x9a\x4c\x92\x81\x30\x57\xe7\xc0\xd9\x07\x4d\x26\xe5\x2e\xaf\xb6\x8c\x9f\xc7\x9c\xa0\x76\xbb\xee\xd0\x00\x8b\xef\x34\x49\x63\xcc\xfa\xbb\x7d\x89\x21\x3e\xbe\xa6\x54\xb2\xca\xf7\xfd\x6a\x93\x53\xce\x99\xa4\x12\x02\xda\x37\x34\xd6\xa6\xbd\x03\x9c\xfd\x48\x9a\x76\x9d\xd7\xd5\x3f\xf2\x5e\xc6\x7f\x19\xfc\x4c\x76\x55\xdb\x36\x3c\xf5\x0b\x24\x92\xba\x3c\x64\xdc\x0e\xe5\xbc\x2d\x0f\x61\x2b\x5c\xb2\xab\xd6\xad\xcc\x92\x0b\x2f\xf0\x8b\x5b\xe1\xb2\x9b\xa6\xfd\xac\x05\x2f\x38\x39\xaa\x4a\x83\xd0\xd2\xb8\xff\xbc\x26\xbc\x68\xe9\x05\x7e\x44\x00\x5d\x92\x17\xbb\xaa\xce\xf6\x79\x5d\x32\x8e\x4e\xf9\x17\xe1\x85\x7e\x25\xba\xdc\x59\x57\xf6\x7d\x55\xaf\x3b\x2e\x96\xac\xf4\x4a\xb3\x92\xa0\xcc\xe5\xf1\x78\xba\xec\xa6\x2c\x0b\x19\x51\x97\xbe\xa0\x74\xb2\x1f\xb6\x5b\x9a\xfb\x6f\x43\xd9\xf5\x0c\xff\x8e\x7e\xd3\x2c\xe4\x77\x52\x75\x1d\x25\x28\xfb\x35\x12\x09\x2d\x40\xbd\xc2\x90\xce\x90\x48\x92\x8f\x5d\x99\xb7\xab\xcd\xa7\x44\xfe\xa3\x47\x4e\x2c\x16\x8b\xa3\x4b\xc3\xe4\xa0\xa4\x20\x3d\x58\x07\xc9\xaa\x29\xf8\xc7\x19\xfd\xa3\xa6\xab\xba\xeb\x89\xa4\x3f\x25\x9a\x60\x30\x49\x09\x1a\xfb\xaa\xdf\x96\x3e\x13\xfb\xa3\xe3\x75\x48\x5f\x54\x6d\xd7\x3f\xee\x2b\x22\xb9\xf7\x43\x9d\xf0\xfc\x88\x9c\xb3\x62\x69\xbb\xfc\x65\x43\xd8\x41\x76\x4b\xf3\xbb\xb8\xbb\xfa\xd7\x37\x27\xe9\x3b\xda\xea\xeb\xb6\xa4\x74\x4a\x6d\xd0\x3f\xaa\xf3\xe3\x22\xa1\x5a\xd6\xd3\x79\xde\xe7\xcb\xbc\x2b\x3d\x5a\xb9\x50\x68\xd4\x95\x81\x52\x99\x6d\x80\x45\x74\x7d\x34\xdf\x39\x3a\xa7\x36\x74\x77\xb8\x36\xde\xf2\x16\xa1\x7c\xe6\x1a\xa8\xfc\x6e\x5b\x72\x3e\x35\x95\xbe\x7e\xfb\xf6\xf2\xfc\x97\xb4\xac\xd7\x55\x5d\xa6\x87\xaa\xdf\xa4\x43\x7f\xf3\xdf\xb3\x75\x59\x97\x2d\x31\x91\x55\x95\xd2\xce\x68\x89\x08\x52\x22\x4f\x99\xdc\x22\xe9\xba\x6d\xb6\x13\xf4\x5e\x5d\xbd\x49\x2f\x18\xc5\xfb\xbc\xdf\x60\x20\xfd\x26\xe9\x7e\xdb\x32\x8a\x5c\x87\xd7\x9b\x32\xbd\xa9\x68\xd6\x00\x6a\x6e\x0c\x1f\x69\xa1\x63\x5c\x24\x65\xdb\x66\xb4\xef\xfb\xbb\x4c\x2b\x6b\x7b\x63\x48\x69\x82\x48\xa7\x6e\xfa\x74\x59\xa6\xa8\xb3\x48\x12\x1b\xb0\x61\xf7\x74\xbf\xdf\x56\x2b\xd9\xb1\x2f\xa5\xcc\x23\x9a\x59\xb4\x62\x29\x84\x03\xa2\xac\x2c\x40\x17\xf1\xbf\xbb\x66\x68\xd3\x88\x0d\xa0\xfe\xa6\x24\xbe\xbc\x19\x68\xcb\xe5\xc4\x53\xb7\xcd\x50\x7c\x03\x4a\xb5\xd1\x7b\x42\x4d\xdf\x37\x34\x60\x60\xc7\x01\xf8\x2e\x4e\x89\xe2\xf8\x54\x68\xcb\x5d\x43\xdc\xc1\x11\x7b\x45\x04\x75\xa8\xa8\x90\x66\xda\xe5\xb7\xb4\xdf\xfa\x26\xed\x37\x55\x97\x16\x44\x6c\x2b\x6e\x98\xb6\xc6\x40\xfc\x58\xc8\x82\x08\x54\x48\xc3\xf2\xe2\x35\x00\xd4\x6e\x20\x6a\xda\x50\x63\xcc\xed\xf9\x68\xa2\x26\xe7\xc6\x89\x29\x51\x3b\xa0\x6f\xa2\xdc\x86\x78\x2b\x73\xbf\x73\x24\xf4\x77\xd8\x3e\x8d\x2a\xbf\xb9\xa1\x51\x75\x44\x15\xaf\xd2\xd5\xb6\x21\x92\xfa\xf0\xfe\x0d\x55\xde\xf4\xfd\x3e\xdb\x37\x2d\xc8\xf8\xfa\xfa\x1d\x6d\x8f\xb6\xf7\xb9\x01\xae\x19\xa6\x1e\x76\x4b\xfa\x75\xd8\x54\xc4\x04\xf2\x60\x81\x80\x8a\x2d\x1f\x30\x75\xda\xd4\x0b\xac\xd5\xd0\x6e\x47\xcb\x48\x5d\x5a\xc9\x91\xe1\xf1\x10\x9e\xf0\x9f\x2b\x3f\x4a\x4c\xb7\xa3\x53\xf8\x80\x45\xa5\xa9\x96\x38\x4d\x88\xb6\x9a\x3d\xb7\x1b\x10\xd7\xa5\x66\x78\x8a\xc2\x09\xe4\xca\xe5\x1c\xa2\x52\x9c\xf1\x01\x2f\xdd\xd1\x84\x75\x37\x5f\x5d\x10\x1a\xb0\xa5\x91\x7b\xd3\x36\x3b\xca\x7d\x41\xff\x7c\x86\x1f\xfe\x05\xb7\x07\x98\xbc\x28\x88\xcd\x74\x27\xe9\xfb\x17\x67\xe9\x7f\xf9\xf1\x87\x1f\x16\xe9\xeb\x9e\x37\x04\xd3\xc8\xdf\x79\x6d\x29\x29\x07\xa2\x03\xa5\x9d\xdb\xd3\xf2\x3f\x60\x02\x7f\x90\x3e\x45\xe9\xff\x28\x7f\xcf\xe9\x9c\x2d\x17\xab\x66\xf7\x9c\x37\xf7\x2e\xef\x17\x09\x97\x10\xd5\x28\x39\x5d\x95\x75\x41\x09\x3d\x56\xb5\x2c\xe0\x3a\x5a\x1e\x1c\xb2\x72\xfa\x67\xab\xa6\xbe\xa9\x5a\x9e\xd0\xaf\x75\xbe\x24\x9c\x98\x5c\x40\xec\x18\x25\x76\x76\x11\xd2\x68\x23\x57\x37\x77\x1e\x14\x53\x7d\xcb\x99\xba\xa0\x09\xcb\x4a\xd4\xa8\x8a\x4c\x0e\xcb\x57\xc8\xc6\xba\x5d\xd2\xf4\x5a\xc3\x77\xe7\x11\xde\xdc\xdc\x6c\x89\xb1\x19\xb3\xd2\x1e\x2e\x25\x57\xf8\x56\x08\x42\xc4\xb8\x87\x64\x73\x5e\x75\x80\x3c\x3b\x7f\x9b\x96\xb7\x44\x6d\x44\x0e\xfb\xb6\x29\x86\x15\x28\x8c\x61\x4f\x52\x3e\x26\x08\xbf\xc4\x19\x56\xc2\xde\x82\xbd\xca\x43\x63\x86\xb0\x22\x20\xda\xa2\x85\xb4\x97\x09\x82\x5a\x13\x24\xac\x9b\x2b\x16\x0e\xc3\xb2\xd9\x0a\x93\xd1\x61\x95\xba\x71\x5d\x5a\xee\x7a\x7b\x97\xe2\xd4\x07\x5d\xac\xda\x32\x90\xed\xba\x45\xa2\x67\x95\x49\x88\xd9\x6d\x45\x42\x45\xb0\x54\x28\x35\x71\x91\xd9\xc3\x9f\x19\x80\xc5\xb4\x6e\xb6\xae\x1b\xd8\x25\x77\xcc\x25\x34\x77\xea\x9c\xc7\xd7\x61\x08\xe8\x81\xc5\x3d\x22\xc6\xdb\x0a\x9c\x46\x91\x85\xb1\x12\xc6\xd0\x35\x75\xd5\x95\x25\x5a\xa0\xfa\x4f\xa8\x4d\xd4\x59\xa8\x08\xa3\xa2\x88\x9d\xbb\x7f\x6d\x86\xb4\x68\x52\x3e\x08\xc0\xce\xa8\xb6\x4d\xb5\xd6\xe9\xeb\x9c\xd3\xb6\x5a\x6f\x88\xaf\x34\x87\x13\x41\xda\x61\xd3\x94\x4c\x3b\xaf\xcf\x9f\x7d\x2f\xe3\x58\x33\x73\x73\x95\x98\x2d\xe6\x43\xdf\x30\x9d\xea\x12\xca\x10\xdc\xf1\x02\xc8\x89\xb0\x24\x40\x63\xf1\xd4\x04\xb0\xe9\x69\xad\xfb\x24\x2c\xd3\x0d\xe2\x61\xa4\xf6\x48\xc4\x55\x29\x26\x5b\x37\x90\xcc\x4c\x6a\x61\x56\x4d\xa2\x74\xd7\x67\xeb\xaa\xcf\x6e\x78\xc3\x72\x9b\x2f\xb8\x2e\x9f\x1c\x54\x92\x3e\xa2\xa2\x47\x29\xed\x7a\x92\x1c\x8b\x9f\xd2\x87\xb7\x7a\x5c\xff\xc8\x3b\x31\xcb\x6f\x09\x16\x8b\x01\x04\xb7\x44\xe1\x22\x2d\x98\xf8\x5e\x34\x44\xe7\x8c\xf3\x6e\xd8\x83\xa3\xeb\x09\x7d\x92\xee\x05\xb0\x68\x0e\xf5\xb6\xc9\x0b\xb0\x1c\xda\x5d\x15\x94\x8f\x65\x55\xe7\x74\xba\x58\x2b\x60\x65\x0f\x89\x1a\xde\x5e\x5e\x03\x70\xdd\x2c\x87\x6a\x5b\x18\xc0\x82\x66\x78\x9b\x6f\xab\x82\xe5\x2c\x5d\xf7\x50\xa6\xb1\xac\x4a\xc6\xb2\x6a\x5a\x3e\x0e\x31\x1b\xab\x78\xe4\x1c\x6e\xf9\x7c\x43\x36\xd5\x55\x58\xd4\x73\x47\x26\xa3\x81\x16\x1e\x02\x28\x1f\xa8\xa0\x98\xaa\xab\x1f\xf5\x18\xe9\x6a\xa0\xbe\x68\xd1\x39\x9b\x2a\x76\xe9\xe3\xe7\xf4\x37\xe1\xe3\x59\xf8\xde\x7a\x8a\x78\x2e\x4c\xa5\x70\x90\x5d\x1a\x0d\x35\x22\x6f\x47\x5d\x46\xbc\xc1\x5c\xc3\xf1\x1a\x09\x74\x83\xd0\x2b\x6b\x5a\x5b\x5a\xd6\xf2\x1b\x4a\x3c\xa2\x0d\xbc\xde\x62\x11\x72\x48\x2f\x24\xc6\x35\x84\x37\x26\x90\x13\xd9\x2e\x37\x34\x35\xe6\x9d\x7d\xfe\x99\xc6\x96\xb7\x24\x84\x25\x1f\x59\x1b\xfd\x94\x0c\x22\x00\x35\xdb\xc2\x09\x9b\xa0\xe9\xa6\x1d\xab\x58\x1e\xc8\xd1\x6b\x47\x52\xe4\x6a\x93\x39\x5d\x96\x91\xd2\x97\xbf\xe3\xcc\x43\x91\x57\x6d\x99\xd8\xb9\x28\xd9\xdd\x61\xb9\x78\x12\x17\x77\x7e\xb5\x48\xfc\xa1\x2d\x42\x22\xfa\xb2\x61\xac\xdd\x96\x0e\xea\x2c\xcc\x8d\x2b\x50\x5b\x24\xa8\x69\x53\xb1\x26\x44\x45\xa2\xae\x69\xa9\xa8\x6c\xa4\x8a\x7c\x54\x1d\xfb\x53\x62\x1d\x44\x4d\x26\x1f\x89\x19\x90\x5e\x22\xec\x25\x63\x6d\xcc\x16\x87\x86\x22\x3c\x87\x15\x33\xe5\x07\xfe\x1c\xdc\x94\x7b\x3e\x32\x77\x1d\x56\x75\x4b\x90\xc5\x9d\xca\x5e\x6e\x7d\x7f\x16\x4e\x4b\x0b\x4e\xfc\xe9\x1b\xd3\xde\xff\x60\x13\xbf\x54\xb4\x92\xa8\x1f\x9f\x1c\x7c\x5e\xd3\x56\xdb\x03\xfb\xb4\x49\xee\x4e\xd2\xe8\x0c\xda\xe4\x1d\x71\x5f\x3a\xe0\xb4\x5a\xb1\x30\xed\x80\x57\x2d\x5f\x09\xc9\x43\x93\x07\x91\x4a\xcd\xa6\x1d\x1f\x69\x3c\x42\x61\x50\xda\x8b\x3b\xf0\x71\x9c\x87\xa7\xfe\x4c\x9f\x84\xb0\x5d\xc9\x32\x5f\xb6\x13\x0d\x5d\x7e\xa5\x17\x65\x42\x82\xc9\x9a\xf6\xa3\xd1\xdb\x33\x56\xc9\xd6\x90\x50\x95\xdc\x18\xa0\xec\x43\x0e\xaa\x10\x96\xf3\xb3\x59\x2c\x68\x63\x1f\xa0\xaf\xd2\xd6\x9c\xa0\x9f\xce\x1a\x2a\x5e\x18\x47\x96\x03\x17\xf2\x49\x47\x9b\xdd\x23\xf1\x34\xa5\xd5\x4f\x43\x28\x95\x13\xfd\xb4\xb8\x02\x6f\xfa\xa7\xcb\xe7\x0f\xbb\xa7\x4f\x96\xcf\x1d\x6b\x5c\x6d\xca\xd5\x67\xd1\x25\xaa\x7a\xd9\xfc\x0e\x85\x8b\x16\x9e\x71\x5c\xf3\x16\x79\x58\xa4\x1b\x2a\x85\x4c\x4e\x5b\x99\xaa\x11\xe2\xb9\x34\x5a\x34\x1a\x0c\xef\xf8\x85\xd9\x7e\xdc\xe1\x60\x84\x44\xb5\xd1\x89\x8c\x8c\xd4\x7c\xec\x1d\xce\x0a\xe8\xf6\x94\x73\x99\x72\xc1\xe6\x3d\xe9\x62\xbe\xdb\x6a\x57\xf5\x13\xd2\x61\x3e\x92\x2b\x09\xaa\x9e\x6f\xb8\x44\x5b\xc0\x06\xc6\x42\xdc\x98\x9a\xa1\x73\xd3\xc8\xe9\x90\x93\x7a\xf3\x63\x4a\x24\x34\xd0\x29\xc4\x73\xa2\x61\x12\x3b\xce\xf9\xe0\x25\x05\x21\xef\xb2\xa1\x56\xb4\x96\x85\x11\xd3\xab\x0a\x87\x04\xf7\x6b\x24\x1f\x40\x19\xe6\x55\xce\x4d\xbf\x75\x18\xff\x8e\x84\xe2\x1b\x57\x8d\x39\x37\x0f\xa8\x62\x99\x2c\x9f\x5d\x3c\xe2\x6c\x75\x29\xea\x15\x30\xc0\x70\xbc\xd0\xa4\x1c\xf8\xd5\x23\x0d\xe3\x33\xe5\x60\x41\x96\x43\xdf\x37\x2c\x73\x6f\x99\x6a\xa4\x8e\x8d\xfa\x0c\x80\x50\x23\x7c\x7b\x58\x90\x10\x4f\xb2\x36\xa5\xc9\xc0\x99\xb7\xc2\xa9\xb6\x32\x9a\x9d\x1e\x75\x0e\xac\x10\x75\x3d\xaf\xef\x8c\x94\x89\x20\x78\x14\xdc\x61\x3f\x3f\x96\x6f\xdb\xf2\x3b\x3f\x1a\xb7\x67\x50\xc3\x46\x24\xd5\x83\xfd\xf4\x1e\xa5\xa0\x12\xb7\xeb\xec\xe4\x52\x23\x8b\xa7\x8f\x36\x46\x2f\xca\x79\x67\x10\x83\x25\xb1\xb1\x00\xa2\x69\x16\xa8\xbd\x18\xf5\xe5\xd5\x9d\x29\x06\xfb\x78\xc8\xfe\x00\xea\x9b\x26\xeb\x36\xa2\x5a\xda\xf0\xd2\x6d\x59\xaf\x23\x33\x01\x6c\xb0\x20\xba\xff\xca\xc7\x1c\x09\xf0\xf9\xf6\x53\x72\x07\x7b\xd4\x5f\x89\xc3\xd7\xb0\xd7\x35\x09\x15\x88\x32\x72\x81\x04\x81\xb2\x66\xf4\x29\xe1\x23\xf0\xed\x48\xac\xe3\x23\x42\xf3\x02\xf9\x02\x45\xbf\x46\xd2\x9a\x2d\x61\xf2\x6e\x46\x04\x7c\x5f\x7a\xbb\x24\x52\x6e\x8a\xa4\x44\x5f\x9b\xaa\x43\xfa\xf4\xe7\x52\x1b\x7f\x45\x6a\x73\xf7\x01\x6a\xaf\xe8\xb0\xac\xf0\xbe\xcb\xef\x58\xe8\x92\x6c\xfd\x81\x82\xeb\x32\xdf\xe9\x28\x39\x29\x4d\x9c\xd2\x71\xa6\x99\x9c\xa4\x53\x2e\xb0\x6a\x24\x10\x3f\x6c\x0a\x22\x8b\xe8\xb1\xef\xc4\xff\x52\x8d\x9e\x7f\x9b\x98\x62\xfe\x96\xe4\xdb\xfd\x26\xc7\xf9\x1f\x80\xc1\xea\x40\x40\x58\xf8\x14\x20\xa0\x85\x61\x57\xb6\xd5\x8a\x93\x5c\xe1\xdb\xc7\xd9\x77\x30\x38\xd1\x46\x21\x41\x30\x6e\xac\xa0\x4d\xf2\x4f\x35\xc8\x69\x16\x12\xc3\x76\xbb\xea\x1f\x36\x8b\xa8\x39\xce\x27\x9e\x43\x10\x10\xc9\x3c\x94\x03\xc2\xc1\xc8\xe2\x59\x9f\x32\x5f\xe8\x59\x04\x8c\x9a\xde\xe5\xbf\x7f\xa9\xe2\xae\x99\xa9\x27\xac\xc0\x57\xb2\x0d\xaf\x53\x8c\xd9\x01\xc1\xb3\x7d\xe3\x28\x34\x2d\x3d\x83\xd4\x9f\xe9\x54\xab\x1d\xd8\x07\xf9\x9d\xe2\xf7\x4f\x66\x02\xa7\x23\x44\x05\xe8\xd4\x19\xc3\xe9\x70\x2e\x98\x6f\x42\x10\x5e\xf8\xed\x16\x0a\xc7\x8e\x9c\x59\x8c\x34\x95\xdf\x31\x0e\x92\x28\x45\x4f\x20\x92\x5a\x78\xbb\x7d\xc6\x67\x64\xc6\x42\x67\x1d\x8a\x96\xee\xf4\xb4\xf3\x05\x10\x62\xf7\xcd\xa6\xf5\x46\x1b\xee\x68\x75\x12\x05\x66\x6a\x5f\x4e\x0d\x79\x47\xea\xf7\xb4\x65\x66\x1a\x70\x3b\xe9\x68\x45\x59\x4c\x54\xa2\x99\x17\x13\x5e\x30\xad\xc8\x60\xa4\xf6\x6c\xb7\xe5\x9a\x4d\x4d\xd6\x71\xd4\x9b\x92\x10\x1d\x06\x02\x16\x12\x90\xc7\xb0\x5b\xac\x70\x5d\x43\x21\xde\xad\x51\xac\x3e\xd1\xa8\x49\x1c\xa7\x24\xd7\x0c\x94\x28\x1d\x86\x9e\xe4\x3b\xd6\x17\xba\x81\x59\x33\xeb\x16\x22\x9d\xc4\xab\xc1\x07\x2f\x9a\x2a\xd1\xc5\xf1\xe6\x89\x16\x59\xe1\xfa\x52\xfb\x00\xfb\x83\x4d\x87\xea\xf6\xb4\x61\x6d\xdc\x01\x1d\x6b\xd6\x29\x84\xe5\xef\x15\xcc\x76\x2f\x2b\x36\x07\x41\x25\x74\x9a\x30\xca\x16\xc9\x96\x98\x01\xab\x1e\x32\x2b\x91\x63\x9b\x5b\xd6\xdc\xb8\x3f\x2e\x95\x7a\x62\xc6\xd3\x49\xf1\x3a\xab\x72\x49\xca\x5c\x73\x28\x8b\x13\x3a\xe2\xb9\x06\x8d\x13\x6c\x23\xdf\x1e\xf2\xbb\x0e\x36\x12\xe3\x38\x6c\xb2\x94\xea\xcc\x4e\x48\x00\x58\x63\x54\xa1\x7d\x9a\x76\x9c\x61\xa2\x23\xde\xc9\x87\x87\x3b\xa6\x0f\x50\x0f\xc1\x2d\xd4\xea\x42\x5a\x37\x1f\x7b\x38\x62\xf5\xac\x61\xd5\x96\x15\x41\x96\xf1\xa5\x38\x68\x08\x2e\x0f\xe5\xfc\x33\x75\x4f\x58\x3c\xa2\x6e\x58\x58\x21\x7e\x2c\xb8\x26\xf9\x8f\x30\x8b\x21\x05\xb6\x82\x81\xda\x7f\x2c\x72\x71\x45\x38\x64\x3d\xcb\xab\xcf\x7c\x36\xd1\xaa\x98\x61\x57\xf2\xa1\xfc\x26\x5d\x4f\x5b\x80\x31\x6d\xce\xb6\xbf\x8a\x7c\xa5\x2a\x33\x97\x62\x8b\x01\x4d\xdd\xa6\xda\xa7\x0d\x8c\x85\x21\x0a\x3d\xd9\x06\x22\x26\x61\xa3\x28\x21\x77\xb3\xd5\xb4\xcd\xeb\xee\xa6\x84\xf9\x74\x97\xde\xb0\x27\x68\xa1\x5d\xb3\xc4\x2a\x4e\xb7\x23\x3d\x8b\x0e\x83\xae\xc3\xd3\x02\x6b\x17\x2c\x54\xdc\x35\xc1\xdc\xa2\x67\x1d\x03\xb0\xea\x5b\xea\x6c\x0c\x4c\x66\x13\x14\x40\x6a\x8c\x9c\x14\x36\x9a\xdb\x32\x44\xc4\xcd\x3f\x3b\xf3\x00\xeb\x6a\x21\x16\xb3\x7a\xbc\x4c\xd2\x29\xac\x15\xf0\x31\x2d\xef\xe2\xd9\x73\x55\x47\x01\xec\xf1\xb8\x2d\xb5\x17\xde\x18\xbc\x57\x46\x0d\xc2\x4a\xe1\x75\x85\xa4\xcf\xa1\xf2\x2d\x69\x88\xab\x4d\xb4\x3b\xaf\x51\x92\x4a\xc9\x64\x83\x26\x1f\xb9\x6b\x52\xe3\x37\x79\xbd\x2e\xd9\xd4\x45\x2d\xf1\x91\x87\xdf\x2a\xa1\x4b\x26\x0d\x78\xdd\x4a\x9a\x0d\xe4\x56\x65\x45\x1b\xb2\xd9\xdd\x5b\xb3\xaa\xcd\x60\xd3\x25\x7f\x6f\x48\x86\x80\xa5\xf7\x4f\x94\x62\xe9\xb7\x4e\x22\xdf\xce\xc8\xce\x00\xf5\xa0\xea\xef\xe0\x74\x5a\x92\x0c\x2c\x4a\x1a\xe5\x90\x9a\x0b\xee\x00\xcb\xc5\x0b\x4b\xd3\x7a\xe4\xcc\xf4\x78\x6b\x4b\x4a\xe1\xc4\x8c\xf4\xc2\xd2\x09\x6b\xc9\xbb\x05\x0e\x07\x16\xa6\x61\x9c\x0e\x8e\x84\x47\x0f\xbb\x47\xbc\x60\x56\xb6\x08\xe0\xf7\x79\x4f\x6c\xb1\x16\x15\x45\x38\x54\x58\x55\x8b\x5d\x13\xe0\x2a\x02\xb6\x80\x47\x57\x50\xf1\x29\x21\x5d\x12\x2e\x40\x9a\x9a\xa4\x66\xdd\x97\xca\x62\x3a\x95\x79\xff\x85\x92\x6a\x11\x49\x5d\x1c\x83\xaa\xaa\x70\xe3\x99\xd3\xa7\x8b\x7d\x40\x5d\xa2\x26\xa0\xd8\xfe\xa3\xe4\xfd\x2c\x3d\x97\x84\x29\xbd\x43\x85\x39\x55\x45\x92\xec\x81\xf7\x2c\x18\xad\x2c\x84\x1b\xb4\xfc\x0f\x6c\xd0\xed\xf8\x64\x27\x2c\x48\x2b\x20\x5c\x73\x09\x40\x0a\x60\x1f\x6a\xa0\xb0\xb1\x71\x15\x9a\x5c\x1d\xb8\x3b\x48\xdf\xe5\x7a\x0c\x76\x28\x97\x29\x9b\x3b\x89\x70\x48\x2f\xd2\x89\xee\x72\x52\xa9\x6e\xab\xdc\x59\x66\x68\xb5\xd8\xf1\xae\xa7\xe8\x0b\x76\xba\xc3\x93\x39\x0d\xc1\x60\x7f\x84\xba\x1e\xde\x68\x32\x19\xf6\x05\xdb\xb4\xfc\x84\x3f\x20\xc3\x4d\x38\x2e\x0f\xac\x8d\x98\xba\x55\x73\xd2\x8c\x80\x17\xa9\xc2\xf1\xc8\xee\x16\xb6\x7d\x66\x62\x37\x74\x0b\x15\x63\x90\xd0\xc8\x2f\x45\xaa\xb4\x1a\xc0\x42\x78\x0f\xd0\x2b\x7e\x3d\x20\x84\xce\xca\x74\xd3\x1c\xd2\x6d\x55\x7f\xee\x14\xbf\xce\x1e\x62\x7a\x72\x7a\x8e\x0c\x02\x16\x4b\x0d\x8b\x55\x55\x3d\x94\x3f\x27\x96\x12\x43\x3c\x92\xd3\x38\x85\x52\x4e\xc5\x31\x33\x50\xff\xc9\x19\xb2\xd3\x53\x64\xcf\xc2\x7a\x3d\x57\xab\xc0\xa3\xcb\xec\x57\x1d\x3b\x37\x25\x0b\xd8\x60\x87\x2f\x95\x0b\x11\x7e\x9a\xa6\x53\xdb\xa3\x67\x3f\x9c\x07\x43\x85\x42\xe9\x6a\x39\x08\x5d\x4c\x19\x8c\xf9\x29\x08\x8a\xd5\x43\x12\x96\x74\x3c\xd8\xdb\x59\xb5\x93\x58\x9b\x0f\x5a\x2a\x2e\x7b\xa7\x57\xa0\x78\x41\x9a\xf2\x68\x32\xa1\xc7\xe0\x2d\xe1\x52\xa6\x6f\x7c\xd4\x0a\x4f\x4c\x5c\x10\x84\xe0\xb0\x8f\x06\x3b\xa6\x2c\x6d\xc0\x8c\xdf\x5f\x20\x30\x23\x9f\xd0\x91\x22\xbc\xd9\xb1\x96\x66\x1b\x09\x85\x67\x6a\xc6\x77\xe5\x8c\xd9\xa0\xfc\x2d\x5c\x5e\x63\x6b\x43\xa4\x29\x69\x0b\x47\xa5\xe9\xd1\x98\x26\x7b\xc7\xea\x1d\x68\x6e\xe1\x74\x8c\xe0\x17\x42\xfd\x39\x2c\xc3\xe2\x15\x1b\x3a\x91\x27\xb9\x2b\xb8\xd4\xa4\x09\x42\x00\x14\x8e\xce\xeb\x19\xa7\xc2\x8d\xd8\x20\x2e\x11\x42\x0e\x40\x83\x84\x62\x7d\xb2\x34\x1f\x76\xc8\xd8\xf6\x2d\x2d\x3a\x1d\xbc\x23\x4b\xd4\x84\xa5\x45\xec\x0b\xdc\xab\x81\x43\xd6\x73\x2d\xd2\x20\xb5\x2d\xe6\xff\x48\x59\x8e\xb7\x5e\x96\x6c\xdd\xb2\x4e\x95\x59\xbb\x52\x61\xd9\x09\x8d\x01\x7b\xa0\x74\xe6\x89\x02\x98\x88\x87\x08\xb0\x10\xc4\x2c\xa1\x96\x9d\x45\x76\x5e\x58\x6c\xff\xc3\x6c\xbb\x51\x87\xce\xb6\xeb\x87\x3a\x22\x1b\x1e\xe3\xe8\xc4\x99\x10\x10\x15\xe0\xfc\xd5\xa5\x0f\x4e\x55\x5d\x7c\x77\xb8\x72\x37\x22\xd3\x33\x9a\x28\x0b\x47\xb0\x12\x01\x38\x2c\x0b\x78\x08\xba\x40\xe0\x8e\x08\xf8\xdd\xc4\x0c\x19\xf3\xd7\x53\x68\x30\x84\x15\x81\x65\x79\x80\x0f\x34\x91\xfe\x54\x23\xda\x31\x22\xc4\xed\xea\xe2\x50\xee\xc4\xe3\xe8\x45\xa2\x13\x55\x1b\x36\xd5\x7a\x43\xf3\xaa\x76\xec\x72\x04\xd7\x36\xbf\x96\xd7\xea\xf8\x17\x6d\xbc\x66\x5d\xb3\x0d\x87\x7b\x58\x60\x32\x8e\xdb\x3e\xed\xfa\xb6\xa9\xd7\xcf\xcf\x1b\x56\xb7\xd8\x12\xc2\x47\xc5\xcf\x4f\x9f\x68\x3e\xb1\x0c\x5e\x43\x8e\x77\x7c\x59\xf5\xaf\x86\xe5\xa3\x2e\x5d\x93\x6c\x80\x03\xe4\x69\x9e\x6e\xda\xf2\xe6\xd9\x83\x87\xdd\x83\xe7\xea\x67\x96\xa8\xa0\x43\xed\xd0\xf2\xf4\x49\xfe\x9c\xa5\xe7\xae\xd9\x92\x50\x1b\x57\x69\x76\x3b\x59\x5f\x62\x7f\x3b\x81\xc4\xf8\xe1\x9a\x2e\x6b\x60\xae\x6c\x15\x3f\xd4\xe0\xc2\xd1\xba\x5f\x1f\x5d\x36\x13\x93\x22\xfb\x82\x0a\x2a\x0c\x0c\x8f\x5b\xdd\x07\x4c\x93\x6d\x0b\xa9\xab\x86\x03\x76\x5a\x0d\x0b\xc9\xe6\x1a\x6f\xda\x30\xe3\x04\x24\x68\xb4\x61\xf5\xa9\x2a\x8d\x44\x24\x0d\xce\xb3\x3e\xe5\xe0\xa4\x94\x91\x56\x40\xbf\xcc\x53\xcd\x94\x09\x81\xd1\x1b\x41\x98\x60\x23\x1a\xfe\xc6\x18\x80\xcc\x3e\xd8\xfe\x90\x5f\x4e\x51\x81\xe4\x17\x68\xdd\x3a\x97\x37\xaa\x63\xa3\x80\x0e\xaa\x40\x9e\x7e\xdb\xa8\x4f\x22\xb5\x4c\x8c\x9a\x04\xe8\xbe\x8c\xc8\x9d\xbb\xa3\x7f\x68\x85\x68\x13\x6a\xfb\x7f\x4b\x0b\x52\xc1\xfd\x76\x32\x81\x54\x37\xd3\xa9\xdf\x0b\x63\x11\x55\xbd\x79\x47\xf7\x53\xb0\x8d\xb4\x55\x17\xa6\x21\xe6\x83\x12\x82\xe0\xb2\xaa\x0b\xd9\x36\x4a\xf5\x1a\xf7\xe0\xc8\x9d\x0e\xd3\x9a\x81\x60\xe3\xe3\x84\xfe\x0e\x90\x7f\x15\xb5\x1f\xd0\x06\x71\xab\xa1\x0e\xb8\x85\x6c\xc7\xac\x6f\xc4\xd6\xa5\x93\x7c\x47\xfa\x06\x62\x9e\x4e\xa5\xc1\x6b\x2e\xee\x34\xee\x4e\x9d\xa2\x56\xe5\xa5\x66\x62\xc1\x01\x98\xa0\xa8\x73\x88\xc0\x2f\xaf\x7a\x5a\x2b\xea\xaf\xd6\x68\x26\xac\x01\x6d\x3d\xe3\x0f\x1b\xf1\x5f\xa7\xa7\xef\x5e\x2f\x12\xd7\x9f\xb5\xf9\x6b\x4e\x32\x93\x8c\xe0\xe0\xb4\x5e\x26\xa5\x31\x7f\x71\xde\x12\xa9\x6e\x46\x36\xd4\x04\x39\xbb\x39\x4d\xe6\x23\x73\x89\xcb\x05\xc5\x65\x17\x58\x02\xa4\x37\x8c\x64\xcc\x99\xdd\x4c\xbf\x21\xc4\x3a\x7b\x14\x9f\x08\xfb\x3b\xe6\x75\x41\xa4\x4a\x2e\x08\x3a\x80\x5b\x8d\x42\x64\x08\x12\xda\x70\xca\xf2\x6d\xeb\xf6\x8a\x0d\x58\x77\x4b\x98\x1b\x50\x02\xc8\x70\x6f\xeb\x19\x8d\xd7\x1f\x74\xe1\xa0\x45\x49\x1f\xed\xcf\x54\xd8\xa8\xf8\x5f\x79\x5c\x22\x99\x29\x8e\x43\xd5\x8c\xda\x3c\x94\x5b\x8e\xa4\xd3\x01\x79\x27\xa4\x2a\x62\x91\x0b\x52\x81\x9c\xf3\x91\x23\x17\x9d\x24\x21\x6b\x1b\x5a\x47\xac\x31\x82\x20\x02\x86\xd7\x51\x34\x28\x63\xf7\x67\xa7\x6f\xdf\x5e\x5e\x7b\x2e\xcf\x94\x55\x17\x74\x16\x7d\xe3\xe2\x6f\x26\xe3\xb2\x28\x1c\x8c\x0f\x01\x59\x11\x84\x8f\x03\xd2\x1a\xc7\xe0\xc2\x8d\x6f\xad\x53\x72\xdd\x60\x37\x37\x3c\x16\xa9\x51\xc4\xe3\x2f\x8e\x29\x28\xc9\x47\x3e\x1e\x3f\x25\x66\x63\xbc\xe4\xff\x49\x68\xa6\x0d\x4c\xe3\xa0\x66\x6f\x41\xf7\xe1\xa6\x34\x80\xa6\x98\x98\x6d\xc1\xf6\x86\x1c\x12\x28\xe1\xbe\x01\x23\xbd\x49\xe1\x5d\x3b\x61\x2b\x54\xd3\x82\x06\x19\xb9\x43\x5d\xfd\x36\xe0\x7c\x67\xf9\x93\xe4\x15\x0e\xeb\x5a\x56\x5b\xe1\xb6\x7f\x76\x3f\x24\x9f\x53\xa3\x58\xcc\xa0\x73\xfa\xf5\xb4\xdb\x73\xa4\x1a\x71\xdb\xee\xd9\x83\xa1\x4a\xd9\xa8\xc1\x91\x21\x0f\x9e\x93\xb4\xc8\x5e\x6a\x5a\x3e\x82\x78\xce\x86\x89\xcf\x66\xef\x1a\x47\xc9\xa3\xcc\x02\x29\xb9\x0c\xd1\x94\xc8\x9d\x19\x85\xca\xd6\x62\xb0\xe8\xc5\xd2\x95\x06\xb3\x60\xee\xcc\xd4\xfd\xb9\x0c\x31\xa5\x1e\x09\x5d\xd7\x73\xfa\xd7\x56\x88\x06\x95\x7c\xbe\xb2\x90\x06\xd7\x15\x5c\xa6\xef\xf7\x8a\xd6\x7b\xc5\x0a\xd5\x62\x5d\xf5\x24\xd3\xf3\xd5\x0e\x68\xda\xb4\x61\x88\x29\xe2\xb6\x83\xa4\x2c\x67\xa6\xae\xc1\xa2\x62\x55\x57\x7d\xc6\xe7\xf4\x4e\x22\xd8\xa9\xd9\x7c\x2b\x32\x50\x8c\x68\x71\x18\xa7\xef\x7f\x3d\x3d\xbf\xf8\x75\xb1\x2b\x2c\xa0\x45\xf1\xa9\x91\x2c\x01\x46\x8b\xf2\x26\x1f\xb6\x66\x6a\xc3\x84\x91\x91\xfe\x82\x0c\xbd\xfc\x40\x5a\x11\xe1\xef\x56\x8e\x44\xb9\x0e\xf1\xda\x72\xbe\x65\x99\xf7\xbb\x23\x06\xa8\xb1\x17\xe7\x8f\xdb\xa1\xc6\x2d\xdc\x6f\x8e\x62\x17\x7f\xc6\xc6\xc5\x54\xc3\x40\x22\xe7\x67\xa2\x97\x33\x2c\x08\xdf\xdd\xce\x90\x28\xfc\xb0\xf4\x38\x2d\x9b\x6e\x94\xc7\x24\x4d\x3a\x70\xb9\x4d\xf1\xf7\xf1\x72\x3b\x94\x9a\x6c\xf3\xa2\x1a\x48\x38\x14\x3c\x1a\x8d\x5b\x4f\xba\x2c\x17\x7a\x67\x24\x58\x17\x85\x58\x20\x7a\x39\x33\x35\x80\xfd\xe6\x2c\x62\xab\xea\xe7\xa0\xcc\x11\x80\x70\x54\x0b\x89\x7b\x2d\x99\x12\xa3\x8a\x80\x38\xc8\xda\xb1\xcd\xd4\xdc\xf5\x79\x18\x6f\x9e\xc8\xa6\xb0\x9d\xa6\x5b\xe4\xc6\xed\x35\x44\x2e\x73\x58\x6a\xbc\xc9\x70\xbd\x25\xc0\x54\x18\x4c\xc2\xdc\xac\x60\x76\xbc\xbf\xcb\xd8\x72\x03\x0e\xbc\xbf\x4b\x10\x72\x41\xe7\x57\x86\xe3\x51\x32\xc1\x0f\xb7\xd5\x5e\x2e\x47\x51\x41\x55\x4a\xdc\x24\x12\x97\xff\x92\x08\x52\xdc\x0a\x61\xa1\x71\x63\x8a\x0b\x88\xef\xfe\x0c\xf6\xd4\xb3\x78\x2e\x96\xe4\x67\x0f\xb2\x25\xed\xd1\xcf\x0f\x02\x71\x9d\xef\x56\xb1\x8c\xfe\x0d\x09\x52\x07\xf5\x77\x7e\x90\x54\x62\xbf\xff\x82\x5f\x03\xc7\xe1\x89\x73\x95\x13\x89\xfe\x62\x83\x6c\xa2\x57\x7a\x98\x19\x25\x2c\x90\x2a\xdb\x20\x61\x34\xe4\x1c\xbf\x0d\x3c\x4b\xd1\x34\x9e\xa5\xff\xca\xbf\xd2\x97\xfc\x4b\xa7\xc2\xdb\xd8\xed\x51\xac\xf0\x68\x63\x87\x81\x69\xe0\x38\x1a\xdd\xe9\xf7\xb4\x44\xb3\x04\xd8\xd7\x30\x16\x03\xe4\x10\xe8\x64\x3f\xb0\xcb\x9e\xd7\xdd\x7a\x7b\x47\x39\x88\x27\xe7\x4c\x3e\xb2\x82\x16\x9c\xb5\x3e\x6a\x23\x71\xac\x42\x59\x44\xdf\x96\x10\xaf\xe8\x9f\x96\x65\x04\x9c\xf5\x39\xec\xb3\x02\x44\x24\xf7\x9f\xd3\x6b\xca\x51\x88\x32\x2c\x4a\x14\x14\xe5\xe3\x4b\x44\xd8\x46\x1d\x38\x2e\x27\x88\xe4\xb7\x65\xd7\x13\x8a\xa0\xeb\xba\x1f\x09\x8f\xb1\xea\x25\x72\x10\xa9\x44\xe3\x5a\xc5\x06\x2f\xc9\x04\x16\xce\x36\xe7\x28\xb1\xf7\xf9\x41\x7e\x12\xa6\xf5\xd6\xd1\x2b\x49\x49\x36\xe2\x9e\x05\x14\xd1\xd1\x0e\x1e\xc7\xb8\xd2\xf0\x3b\x4b\x27\x36\x80\xc5\x74\x20\x56\x32\xba\xf4\x94\xae\x46\xe5\x37\x22\xde\xbf\x60\xe1\xde\xf2\x72\xf0\xaf\xd4\xa2\x38\x5c\xfe\x8e\xb6\xbf\x18\xf3\x2e\x24\xe5\x4a\x0a\x09\x30\x3a\xe7\xfb\x75\x96\x67\x21\x9c\x97\xfc\xdf\xe5\x12\xc1\xe8\xfe\xa1\xff\x89\x62\x9e\x73\x55\x91\x93\x5b\x56\x3e\x3b\x13\x1e\x27\x85\x58\x8e\x49\x61\xb6\xdf\xe6\xab\xd2\x85\x8c\x02\x08\x7c\x9b\x6f\x78\x29\x30\x49\x7a\xec\x67\x5f\x52\xf9\x43\xda\xce\xf4\xcb\x4a\x68\x33\xd0\x59\xe8\x8a\xce\xf8\x67\x61\x85\x84\x7b\x0e\x42\xb4\x31\x44\xfd\x87\x65\x74\x7e\x30\x6f\x12\x0b\xde\x5b\x16\xa6\x39\xcd\xb1\xfa\x33\x35\x1c\x35\x85\xc4\x74\x0c\xe6\x68\xcb\xbb\x23\x35\xe9\x60\xe0\x50\x79\x88\x91\x9a\x1c\x41\xe8\x41\x84\xe3\x67\x5a\xb2\xe0\xe8\x5f\xb7\x21\x4e\xe1\x73\xc3\xa6\x98\x03\x95\x0e\x38\x5c\x8a\xe3\x00\x7d\x97\x85\xaa\x45\x73\x95\x84\xab\x14\xd9\xf2\x4e\xeb\x08\x33\x29\xd8\xa3\x77\xa4\xca\x8e\xdd\x76\xe0\xb2\x5a\xe5\xc2\x65\x84\x55\x78\x91\xd1\x30\x41\x48\x3a\x7d\xf8\xf1\xfb\x4f\x1d\xb7\xec\xac\x26\x4f\x1e\x7e\xfc\xe1\x13\xb1\x62\xfc\x63\x5e\x6c\xb5\xf7\x6d\x79\x5b\x35\x03\xae\x18\x6a\xd2\x93\x1a\x02\x8d\xdf\x72\x50\xb1\x66\xc9\xb2\x9b\xc0\xee\x69\x2e\x2e\x5f\x35\xdb\xc6\xd3\x24\x7e\x8d\x01\x44\x33\x78\xa8\xa4\xd2\xc5\xc5\x20\x5b\xb7\x18\x0f\xe1\xb1\xa9\x47\x0b\x22\x90\x65\x51\x71\x3b\xbf\xd2\xbf\xb8\x60\xe4\x9d\x8a\x0b\x5d\x60\x9a\x0c\x10\xe1\x69\x76\x3f\x66\xda\x8a\xfa\x78\x00\xea\x54\x93\x59\x30\x2f\xc9\xaa\x3d\x92\x0e\x16\xd9\x44\x90\x64\xd4\x3d\xcb\x1c\xab\xaa\xe5\x92\x10\xb7\xcd\x46\x3b\x94\x8a\xfb\x4a\x5b\x3e\xee\x56\x99\xef\xda\x6b\xa4\x32\x52\x1f\x18\xac\x2a\x51\x6c\x0f\x0a\x98\x7b\xc0\x86\xfc\xbe\x0c\x8a\x67\x98\x48\x50\x3a\xcf\x48\xc6\x00\x85\x9c\xb6\x9c\x78\xd8\x45\x7d\xd3\x39\x3e\x94\x99\x72\x52\xda\xe9\xf4\x2b\xc5\xaf\xf1\x10\x98\xa7\xce\xf5\x6d\x2d\x8f\x66\x44\x08\x59\x6e\x48\x1e\x92\x10\x48\x39\xb8\x83\x03\x8d\x30\xaa\xce\x7d\xd5\x7c\x15\xab\x51\xf3\x52\xcb\x55\x9f\xc5\x8e\xed\x05\x44\x17\x86\x05\x33\x5a\x4d\x58\xea\x27\x7d\x4e\x33\xe6\x23\x24\xfd\xd6\xee\xc6\x7d\x17\x4f\xb2\x14\xff\x14\xff\x0f\x0b\xdc\xa5\x0e\x6d\x2a\x13\x92\xd2\x16\xd1\xb8\xe6\xf8\xcb\x0e\x27\x2e\x36\xef\xd1\x1d\x35\xf7\x78\xb7\x7b\x5c\x14\x8f\x66\x66\x1d\xd0\x93\x9b\xf6\xc8\xcc\xa8\x1c\x6d\x44\x58\x41\x4b\xc1\xe6\x9c\xc7\x1d\x03\x44\xeb\xf4\x81\x23\x1c\x4a\xd6\x3a\xd2\xc2\xe3\x0d\x6e\x91\x60\xed\xba\x86\xf4\xfb\x66\x4f\x68\x77\xe6\x1c\xb6\x3d\x48\xcc\x57\x38\x93\x91\xaf\x31\x28\x1a\x85\xa6\xde\x3b\x3c\xc3\x83\xf8\xc0\x3a\xd6\x65\x77\x47\x50\x22\xd7\x4a\x8f\x22\x24\x60\x27\x1e\xa9\x8e\xa5\xcc\x00\xce\x31\x14\xdf\xf7\xbf\x27\x53\x99\xeb\x7c\x8e\x04\xbe\xc4\x56\xe6\x6e\xb8\x5b\xde\x42\xe8\x1b\xa1\x04\x92\xf2\x45\xc1\xcd\x14\xe0\xe7\x2c\xfc\xed\xc1\x36\x4d\xf3\x59\x6e\xe7\x2c\x91\xf4\x25\xa4\xff\x5b\x21\x5f\xfe\x7d\x15\x97\x2e\xf3\xae\x5a\x85\x57\xf3\x7f\xe1\x8c\x99\x21\x16\xbc\xc6\x6d\xf6\x0f\x91\x53\xce\xf1\x2b\xfd\x5f\x4c\x18\x0e\x44\xe3\x00\x2e\xed\x36\xd6\x15\x47\x03\xb8\x52\xf5\xc3\x06\x5d\xa9\xdb\x78\xda\x97\xba\x34\x59\x0d\x98\x37\x37\x39\x7f\xfe\xb1\x2a\x46\x1f\x63\xcd\x9d\x2d\xa5\xce\xef\x39\x71\xed\xcf\xb9\xf4\xe3\xc8\xc3\x7b\x08\xc5\x0d\xc5\x05\x35\xb1\x3e\xa2\xc9\x4b\x8b\x8b\x9a\x82\x39\xeb\x9d\x8f\x85\x8a\x95\x7d\xb6\x4d\xd7\xe2\xea\x44\x3c\x14\xc7\x4d\x71\x56\x1c\x84\x45\x74\x2d\x57\x99\xfd\x35\x06\xc4\x54\xc3\xd4\xcb\xb7\x38\xac\x5f\xbc\xf2\x80\x88\x48\x0e\x2e\xeb\xc4\x58\xa2\x91\x5d\xe2\xe5\x17\xab\x5f\xee\x6e\x01\xb1\x2b\x61\x6c\xdf\x71\x0e\x1c\x7f\x95\x47\xc2\x04\x6c\xa8\x28\x0b\xc8\x67\x14\x14\x03\xdc\x07\xb6\x86\x11\xa0\x21\xe5\x92\xf8\x93\xb8\x22\xa4\x5a\x1e\x05\x95\x49\xfc\x22\x0c\x30\x6a\xec\x5c\xe6\xab\xcf\x6e\x44\xcc\xfe\xca\xb6\x47\x38\xd7\x14\xed\xec\x4e\x5e\x41\x8e\x7a\xba\x7f\xfe\x18\x36\x04\xb9\xf9\x8d\x59\xc8\x06\xaf\x6e\x02\x84\xc0\xa5\xc2\x2e\x92\xdb\xaa\x18\x88\xbc\x79\x31\x16\x4f\x9f\xec\x9f\xc7\xf5\x89\x22\x60\x57\x3a\xda\xc6\x68\xe1\x58\xa9\xad\x70\x8d\x84\xe3\x25\x11\xb8\x77\xe3\xe3\x51\x3b\xf4\x70\x74\x17\x05\xac\x28\x20\x75\x63\x27\x5f\x08\x67\x98\xe2\xc4\xec\xbd\x78\xff\x03\x36\x5f\x07\xc3\x1e\xd0\x2c\x20\x6d\xf8\x15\x8c\x66\x67\x9a\x12\x7f\xc5\xc8\x7a\xe6\xc3\x03\xdd\xd0\xac\x42\x7b\x7c\x78\xb1\xfd\x3c\x9d\xb1\x9b\x3b\x50\xf6\xdc\x79\x8e\x29\x4a\x6b\x51\x60\x3e\x67\x41\xf6\xf1\x0a\x23\x3f\x62\xd4\x56\xec\x47\x0c\x06\x28\x47\xcd\xb1\x76\xce\x66\xdb\x50\x6f\x47\xd0\x0a\xa2\x80\x2b\xc4\x7b\x66\x7a\x35\x4d\x22\x98\xd2\x71\xc0\xa5\x96\x1e\x36\x4d\x70\x31\x42\x9c\x9b\xd8\xac\xe1\x40\x16\xf1\x5c\x0f\x72\x3e\x28\x5e\xf4\xb4\x18\x1d\x23\xb6\xf9\xec\x2c\x41\x90\xfd\x6e\x20\xde\xb2\xad\x68\xd1\x71\x64\xe8\x03\x0b\x97\x57\xd7\xb8\xba\x4e\xbc\x90\x18\xcd\x9a\xe9\x35\xfd\xcb\x86\x54\x2d\x0e\x83\xe5\x77\x0e\x38\x3a\x61\x9d\x36\xab\x15\xc7\x24\x54\xb5\x5e\x0d\x3d\x94\xe6\x3d\xab\x8b\xad\xc4\x27\x84\xd1\x1d\xc6\x77\xc5\x70\x96\xe2\x2d\x03\x66\x02\xdd\xbe\x5c\x91\x50\xb2\x48\xdf\x90\x88\xc6\x17\xe4\xe5\x09\x05\x30\xcc\x7b\xed\x6c\x6e\x26\x30\x78\xb1\x96\xb7\x98\x1e\x90\xee\xa5\x15\x3b\x25\x31\xef\x3d\xc7\x40\x8a\x36\xca\x05\x24\x4e\x94\xdb\x1b\x89\x67\x65\x07\x22\x44\x39\xb9\x96\xcf\x4e\x0c\xb9\xad\xcc\xa6\x40\x34\xa0\x91\x19\xf0\xc3\xe2\x12\x17\xcf\x6c\x5f\xb6\x2c\x8e\x58\x0c\x53\x18\xbe\x32\x1e\x13\xd4\x38\x1b\xd7\x6b\x61\x0b\x58\x3e\x08\xae\x72\xe3\xee\x84\x79\x31\xcb\x7c\xe6\x1b\x37\xe3\xf0\x5e\x6e\xd9\xf1\x49\x47\xf8\x42\x88\xb8\x81\xc8\xf9\x81\xab\x34\x1c\x2b\x3d\xe8\x72\x58\x64\x18\x10\xca\xfd\xcc\x8c\x48\x0f\x64\x46\x90\x78\x7e\x26\x10\xde\x47\x0f\x20\x73\xd4\x8f\x59\x98\x82\x7b\x39\xe0\x55\x44\x89\xba\xa7\xd0\x62\x78\xf9\x58\xc8\xf7\x9e\x6d\x14\x50\x79\xf4\x76\x0e\x66\xa8\x97\xee\x9e\xf2\x8d\xb1\xe7\x4c\xbd\x4f\x9f\x20\x69\x17\x0d\x8d\xf2\xf8\xa9\x8e\x80\xe2\xf8\x19\x86\x86\xf0\x87\xa3\xaf\x2d\xd7\x79\x5b\x58\xc4\xbd\x52\x3f\x3b\x94\x41\xe5\x61\x40\x55\xbe\x25\x89\x5c\x9b\xa0\xdd\x4a\x20\x9f\xd9\xbc\x46\x84\xc2\x0f\xcd\x98\x12\xc2\x9c\xbf\x90\xad\xc5\xb1\x2a\x44\xf0\xc3\x9e\xf7\x80\x6c\x28\xeb\x07\xd3\xfe\xf6\x4f\x57\x97\x6f\x4f\xd2\xdf\x1f\x1f\x0e\x87\xc7\x5c\xfd\xf1\xd0\x6e\x39\xaa\xa3\xe0\x88\xfe\xff\x79\xf1\xe6\x24\x2d\xfb\xd5\x77\x0b\x92\xde\xb1\x35\xbc\xd8\xab\xce\xee\x1b\x76\xc2\x33\x59\xb2\x66\xf7\xcf\x6f\x99\xbd\x5c\xfd\xd2\x67\x51\xc2\x8b\x60\x21\xd3\xe6\x65\x37\xeb\x92\x52\x81\x58\x99\xbc\xc4\x58\x92\xae\x84\xab\x9f\x48\xf8\x02\x60\xd5\x96\xef\x03\xa3\x43\x84\x1b\xe4\x77\xec\x2c\x1c\xb6\x85\xd0\xa9\x71\x34\x9a\x9d\xa2\xac\x2c\x7e\x1e\xb7\x04\xa3\x33\x5e\x81\x78\x96\xfe\x89\x15\x3d\x46\xa9\x50\x01\x17\x19\x15\x00\x38\xa4\x25\xec\xb0\x54\xaf\xb1\x96\xe3\x02\x6f\xfe\x3f\x2f\x7b\xc4\xbd\xcd\xd1\x86\x8c\xdc\x8d\xcd\xaf\xa6\x6d\x54\x3a\xd7\xa8\xb1\x56\xb8\xb7\xf8\xb0\x23\x6a\x1e\xed\x01\x3e\x97\x0e\xe3\x7d\x30\x3e\x92\x74\x93\x79\x76\xaf\x9b\x6c\xc2\xf1\x15\xf0\x4b\xfb\x4c\x25\x88\x89\x44\x17\xf4\xa0\x92\xdd\xa4\x07\x89\x88\xc9\x74\x96\x16\x90\x8e\x28\x99\x73\x97\x17\x1f\x41\x46\x35\x60\x20\x31\xc9\x30\x42\xba\x2d\x89\x79\x59\xb8\xc3\xf9\x30\x8b\x02\xa1\xae\x18\x04\xe1\x4f\xec\x36\x34\x17\xdb\x24\xf8\x2b\x14\x33\xa4\x55\x0b\x6e\x90\x20\x8c\x51\xe1\xf8\x79\xa2\x51\x31\x6b\x16\xf2\xfe\xd9\x99\xa4\x42\x6c\xed\xb7\xcd\x9d\xc5\xc7\x9d\xe3\x97\x06\x9e\x87\x33\xf3\x60\x3a\x29\x0f\x19\x48\xf0\x4d\x16\x37\xf7\xd7\xe0\x0a\xb2\x8a\x01\xf5\x5d\x2a\x30\xec\x3c\x0f\x45\xbd\xc8\x2a\x33\x33\xbc\x99\x10\x2b\x07\x35\x0e\x06\x3b\x77\x3d\x1c\x09\x06\x8b\xab\x86\x01\x61\x41\xd5\xaf\x08\x08\x8b\x91\x34\x0d\xf7\xf2\x53\xfd\x8a\x88\xaf\xb9\x49\x07\x06\x08\x25\xe3\x39\xc4\xcf\x54\x98\x33\x44\x14\xe1\xdc\xbc\x25\x22\x34\x3b\x88\x6e\x40\x5b\xe1\xa6\x99\x28\x7c\x5f\xa3\x63\xce\x8d\xc4\xa3\x24\x40\xee\x97\xcc\x12\x45\x75\x73\xb3\x58\xb6\xcd\xa1\xe3\x88\x33\x3c\x32\xc4\x4e\x31\xfe\x9d\x5e\xe1\xb7\x80\xec\xf3\x56\x88\x42\x12\x92\x29\x4e\x1c\xca\x94\x84\x64\xf2\xd1\x36\x79\xe4\xe5\x9c\x4a\xf0\xae\x0a\xbf\xb9\xc4\x81\xe2\x52\xb2\x90\x2a\xc4\xce\x0f\x19\xa7\x10\x29\x07\x13\x09\xab\xe2\xa8\x74\xc5\x39\x0a\xc6\x49\x43\xb8\xc5\xdd\xb0\x6d\xd5\x42\xf7\x21\x87\xf9\x10\x1c\x10\x96\xc1\x11\x18\x11\x43\x05\x41\xcb\x83\x84\x11\x3c\x04\x61\xb8\xf4\x10\x8a\x20\x6c\xfa\x5f\x5e\xbf\x95\x9f\x70\xcb\xe9\x45\x06\xf8\xe5\x5e\x70\x80\x84\x39\xfb\x16\x73\x4e\x3f\x2b\x13\xe7\xa9\xe8\xa7\xf6\x76\x23\x7e\x39\x88\xa2\xcd\x6f\x60\xab\xe4\xff\x2e\x97\x84\x39\x5f\xed\x5d\x5b\x3e\x1e\x57\x23\xe4\x08\xaa\xaf\x90\x70\xf9\x6a\x6b\xe4\x7f\x2e\x2f\x67\xbb\x62\x80\xc3\x87\x85\xc7\x88\xb9\x0e\x89\xee\x1e\xd2\x41\x5b\xb1\x02\xae\x04\x3a\xea\x10\xd4\xe1\xef\xe6\x83\x76\xf0\x0e\xa2\x41\xf4\xf9\xda\xc5\xbd\xe5\x6b\x71\x87\xf8\x32\x88\xf6\x76\x99\x2a\xaa\xe3\x2f\xe8\x9b\x49\xc1\xbb\x86\xa9\x1c\x2f\x8d\xad\x42\x8f\x33\x65\xb2\xab\x19\xf7\x61\xba\xcd\x62\xbc\x10\xce\x2d\xa3\x38\x4b\xf1\xdb\x41\x99\xa4\xc2\xe4\x92\xed\x8a\x40\x58\x11\x02\x0a\x8f\x95\x8b\xbc\xfd\xcc\x4f\x0f\xc1\x51\x64\x0d\x1c\x5a\xbd\x00\xc3\xff\xc3\x15\xd3\x27\xaf\xde\x49\x6a\xd2\x61\xec\xa7\x44\x6d\xe8\x4c\xc6\x4c\x5d\x05\x96\xae\xe4\xb2\xd5\x1b\x49\xc9\x5b\x95\x63\xca\x98\x06\x80\x52\xd9\xe3\xf1\xba\x05\xf0\x0e\xd1\x7f\x29\xff\xef\xff\xfe\x3f\xc4\x9e\xf6\x0d\x9d\x96\x08\x4d\xd6\x5b\xb1\x7e\xdd\x2d\xce\xc5\x3f\x50\xf6\x18\x3c\x3a\x18\x88\xa0\x3f\xd5\x68\x5f\x4a\x4d\x68\x94\x5f\x2f\x32\xfa\xbe\x62\x1b\x55\x4c\xe4\xd0\x76\x3c\x99\xc3\x3e\x3e\x6e\xc3\x88\x2a\xd3\x33\xc2\xdd\xca\xb3\xc5\xc5\xa2\xc9\x5d\x17\x25\xba\xf9\x23\x25\xf9\x48\x3a\xf5\x27\x7f\x77\xdb\x2d\x44\x74\x6f\x1b\x2a\x8e\x87\x31\x84\xbd\x64\xf2\x9b\x3e\xd5\x28\x2a\xa3\x3c\x14\xc1\xac\xc5\x45\xb3\xc9\x5d\x4a\x89\xb4\x77\x8d\x84\x1d\x3d\xea\x2c\xdc\x5e\xdf\x10\x41\x40\xfb\xcc\x9d\x87\x30\x8e\x9f\x34\x46\x75\x4a\xc8\x1d\x51\x75\xc7\x44\x2f\xb7\x22\x52\xc3\xec\x3f\x26\x06\x16\x89\xfa\x09\x38\x7a\x80\x13\x7c\x8d\x97\xdf\xc3\x64\xf2\x13\x0b\xef\x6b\x64\xd0\xbe\x46\x06\xae\xa8\x23\x3e\x82\xff\x27\xb8\x18\xa8\x46\x0a\xce\xd5\x94\xe6\x8f\x2e\x1f\xb6\xd1\x43\x4b\x3e\x86\x04\x97\x92\xa3\x97\x8d\xb8\x71\x20\x6a\xc6\x45\x34\xb9\xaa\x8e\x95\x41\xee\x7d\xd0\x51\x24\xde\xa3\x2d\xac\x76\x7a\xb3\x85\xdb\x22\x2e\xa7\xce\x64\x25\x19\x5c\x94\xe6\x17\x45\x6a\x7e\x23\xcc\xb0\xec\xba\x09\xb6\xcc\x46\xfc\x47\xbe\x1a\xaf\x57\xbe\xa4\xcd\xf3\xb3\xc0\x73\x8c\x46\xd5\x75\x81\x90\x80\x3a\x3e\x3b\xdd\x92\x82\xb0\x8d\x94\x19\x34\xc4\xa2\xdc\xcf\x47\x82\xd9\xa6\x8f\x0a\xfc\xf1\x70\xb6\x69\x1b\xf7\x07\xb4\xfd\xb3\xae\x8b\xf9\x0b\x83\xae\x78\x7a\x73\xd0\x15\xcd\x5d\x21\xfc\x37\x38\x12\x88\xa4\x74\x18\x93\xbd\x7d\xd4\x93\xa0\x75\x9c\x21\xfa\xf8\x63\x0e\x7f\xdc\x9f\x10\x5d\xa1\xff\x0a\x69\x2f\x9e\x71\x20\xe8\x45\xa3\x72\x08\x61\x83\x55\x1c\x5a\x7d\x4c\x7b\xf3\x82\x6b\xc4\x33\xc6\x3a\xde\x24\x92\x1a\x33\xbd\xb7\x4a\x1c\x57\x1d\x0e\xd3\x99\xa7\x7c\x24\xb2\x59\x71\x24\xa2\x5a\xcc\x79\x5f\x0e\xab\x3e\x62\x1f\xbe\x2f\xbe\x7a\x3c\x4a\xe6\x35\xee\xb9\xd5\x70\x90\xf7\xd6\x08\x8f\xd9\xd8\x07\xf3\x6f\x89\xb9\x9e\xb7\xc1\xb2\x0e\x78\x30\x53\x0c\x0e\x65\xc3\x9f\x37\x28\xb0\x0e\x61\xf8\x12\x25\xc3\x33\x5c\x8f\xb9\x01\xaf\xa8\xf6\xe3\x41\xf3\x8d\x0c\xe1\xde\x0b\xbd\x4f\x6c\xb7\x75\x46\xf9\x9e\xf5\xe1\x32\xd4\x5e\x22\xa6\x3d\x90\xfc\x86\xb8\x33\x5b\x32\xae\x1f\xf7\x11\x47\x9a\x5b\xae\x33\x83\x5f\x20\xe1\xf2\x09\x6b\xab\x12\x91\xc0\x67\x92\x72\x25\xaa\x6b\xe9\xb3\x18\x7e\x10\xf2\xe4\xc1\x33\x58\x42\x7d\xae\x9e\x7a\x8a\x6b\x0e\xa6\xa4\x45\xb9\xdb\xf3\x12\xe6\xee\x0e\x30\x2f\x93\x00\xaa\xb8\xa9\xa3\x82\x84\xfc\xd3\xb8\x2d\x79\xfe\x4d\x4f\xcf\xb7\xcd\x21\x91\xa3\x73\xc1\xb7\xf4\x53\xb9\xa2\xaf\x39\xf1\x90\x24\x8f\x65\x14\xbd\x1a\x83\x39\x90\x98\x2e\x37\x61\xa6\xe5\xa3\xe8\x60\x9c\x1c\x2e\x2e\xd8\x5e\xdc\x60\x01\x14\x52\x03\x02\x3a\x59\xae\x0f\x89\x63\xa1\xad\x42\x80\xf5\xdd\x8a\x24\x1a\xf5\x1b\x42\x7c\x4d\xc7\x3c\xce\x49\x77\x27\x66\xdf\xc2\x05\x4c\x0e\xfa\x14\x7e\xb8\xb3\x71\xc8\x0b\x95\x6e\x1c\xee\xf9\x53\x3f\x8e\x10\xe2\x6b\xc6\xc1\xbd\x3c\xe1\x17\xe3\xb1\x88\xf7\x8d\x87\x94\x43\xbd\x4f\x1a\x7a\x4f\xba\xf1\x10\x7d\x78\xed\x75\x70\x5e\xc3\x03\x59\x8c\xe4\x0f\x36\x6f\x4e\x0f\x4e\x29\x11\x47\xd8\x8c\x88\x20\x8e\xe2\xd9\x6b\x45\x5f\xde\xe2\xbc\xd2\xa8\xe9\x40\x03\x17\xb0\x07\x9b\x3b\x85\x74\x5c\x5e\xa4\x83\x8c\x75\xa1\x72\x9d\x14\x7e\xf9\xe0\x15\x38\xbb\x10\x24\xf2\x5d\x78\x64\x40\xc0\xb3\x95\x2c\xe4\xf9\x21\xb7\xc7\x99\xd5\x05\xbd\x4e\x1b\x73\xac\x1a\x50\x8e\x45\x4f\xe1\x8c\x77\x86\xd2\x59\x60\x6c\x65\xa6\x7c\x62\x32\xab\x78\x5b\x0d\x6a\x97\xdf\x45\x0e\x60\xbe\x08\xc5\x1a\x59\xb4\x6b\x8e\x9f\xd8\xd3\xa1\xf8\xb3\x5a\xde\xf4\x71\x04\x73\xd4\x28\xb3\x08\xb7\xfa\x94\x40\x3c\xd9\xad\xdb\x9c\x6d\xe1\xb6\xd6\xcc\x2c\x02\x52\x40\x83\x3f\xb9\x59\xba\xf7\x91\x3d\x37\x80\x87\x8d\x1a\x7a\x74\x1f\x53\xf8\x03\x03\x00\xdb\xb8\x7f\x04\x60\x0b\xf2\x32\x11\x0d\x23\x60\x01\xf7\x0d\x44\x1f\x36\xfe\xfa\x81\x80\x6f\x7c\xe5\x40\x4e\x6c\x14\xfa\x1e\x46\x51\xcc\xee\xff\xfb\xc6\x37\x52\x77\x40\x9c\xd1\x83\x2b\x23\x82\x8f\x3e\x32\xe1\x88\x3e\x88\x85\xb0\x66\xe1\x00\xd3\xd8\x0c\x3d\xce\x7c\x53\x35\x2d\x21\x54\xd9\xba\x0f\xe3\x37\xe2\xab\x0f\x1c\x51\xd0\xb7\x77\x2a\x92\xf0\xe4\xe2\x9b\x17\xfe\x5e\xb9\x28\x61\xf0\x65\xca\x23\x3c\x1f\x81\xf6\x4f\x47\xbe\x16\x23\x8f\x6e\x8b\x7b\xba\x8b\xbe\x5c\x32\x7d\x0f\xe5\xde\xb7\x68\xe2\x37\x78\xc6\x8f\x31\x75\x72\x77\x6e\x6d\xb2\x9c\xbd\x6b\x9c\xf8\xe0\x8d\xab\x3b\xc2\xc1\x0e\x4f\xb9\xaf\xf8\x19\x82\xa6\xae\xc4\xef\x7f\x21\x29\x7e\x89\x82\x4d\x31\x6a\x87\xe1\x2b\x9d\x3e\x78\xd7\xcf\x0e\xc6\x45\xb6\x31\xa9\x20\x20\xe9\xa0\x3c\x78\x1b\x05\xf1\x96\xad\xbd\xf6\xe2\x5b\xc0\x48\x60\xc2\x1c\x82\x91\xe9\x38\xd0\xe8\xd0\xcd\xf5\x98\xb1\xa3\x2e\x55\x37\xa5\xfb\x04\x05\x33\x09\x7e\x00\xa0\xe0\x07\x00\xe4\x95\xf3\x93\x20\x23\xc2\x79\x58\xb0\x77\x57\xad\xa3\xec\xf8\xe0\xf3\xf9\xb8\x66\x12\x67\xf1\xdd\x92\x28\x23\x5f\x4d\x7a\x31\x03\x76\x98\x27\xb1\x74\x61\x0e\x1b\x13\xd9\x61\x17\xb5\x1e\xdf\x40\x0e\x8b\xe4\x59\xa1\x28\x4b\x5f\x52\x8e\x67\x22\x36\xd5\x30\x6f\xdb\xac\xf9\x49\x24\x18\x21\xe3\xe9\xa9\xec\x1c\xb7\x69\x21\x7d\x51\x13\x88\xb7\x0e\x73\xe0\xd7\xea\xf3\x2e\xae\x8d\x2d\x18\x66\xe8\x8d\xd4\x09\x20\xe9\xd4\xf9\x6a\x83\xf9\x2f\xe6\x08\xc9\x54\x63\x47\x4c\xfa\x0d\x95\x19\x48\x79\xed\x3a\xb5\xb7\xad\x67\x61\xf8\x23\x1a\x78\x4a\x3c\x28\xe5\x10\xd9\x3a\xd3\x4b\xda\x8d\xde\x49\xe3\x78\x59\x77\x21\x3b\xbd\xc4\x8e\xeb\xee\xad\x14\x9c\x62\x7c\x01\x40\x2f\x81\x6b\x4d\x91\x38\xee\x39\xce\x7c\xcb\x7a\x30\x6a\xe4\x42\xee\x75\xb5\xce\xcb\x09\x2c\xdd\x58\x68\x83\x23\x92\xaf\x6a\x63\x34\x4a\x0f\xe1\x9a\xf9\xe3\x43\x85\xf5\x8c\x2f\xca\xc0\x22\x17\x0d\x32\x62\x6b\x06\xf2\x85\x16\x46\x43\x9c\x6d\xe2\x0f\x0c\x92\x9f\xdf\x5f\xaf\xdc\x73\xe5\xe7\xfc\xd2\x45\xbb\xe4\x2b\x39\x7c\x86\x95\xf2\x19\x89\xa6\x8e\x2d\x70\xf3\xd5\xef\x1b\x19\x06\xc4\x3a\xf7\x5c\xf3\xc7\xc6\xd6\x96\xdd\x5d\xbd\xca\xf0\x76\x7c\xb7\x51\x47\xe5\xfb\x52\x6c\xe5\x8f\x16\x94\xf7\x24\xd7\x7b\x91\x25\x5c\x7a\xdd\x23\x79\x0a\xe8\xdb\x15\xe5\xe3\xed\x7a\x3a\xe2\x1e\x83\x27\xa2\xb6\x09\x70\x24\x9e\xf5\xdf\xdd\xdb\xd1\x68\x2e\x01\x43\x0c\x70\xdb\x62\x28\x7d\xf9\x55\x33\x08\x9c\xe4\xe1\x34\x98\x0c\x74\xf7\x83\x57\x84\x6f\xde\x31\xe2\xbe\xe5\xab\xa0\xfc\x76\x09\x3f\x09\xac\xe1\x3e\x7a\xa0\xd9\xb7\x01\xd4\x78\x74\x64\x42\x61\xbf\xf7\xac\xd0\xa3\x68\x14\x5f\x9e\x63\x78\x08\xc9\x57\x4f\x86\x3d\x3e\x3d\xe5\x3e\x77\xf2\x01\xbf\x43\xa6\x20\xcf\x10\x65\xeb\xa6\x6d\x68\x79\x60\x22\xb6\xa7\x89\x5e\x5a\x5e\x37\x53\x01\x26\xf0\xbb\x6c\xd0\x9b\x62\x56\xe7\x02\xd9\x24\x3f\xf0\xb5\x31\x5f\xab\x6f\xfa\x7c\x6b\x75\xd8\x02\xb9\x52\xbb\xf5\x35\x17\x58\xad\x53\x2b\x08\x6a\x6a\x9d\x66\xc9\xf1\x9e\xa8\xa2\xc0\x97\x9a\x13\xc0\xc2\xcd\xc1\x77\xb5\x08\x5d\xc3\x3e\xe3\xa9\xe2\x9a\x8f\x64\xa7\x6f\x90\x9d\x5e\x73\xf6\xb4\x07\x1b\x95\xab\x36\x1a\xd4\xb1\x7a\x37\x6d\x39\xa9\xf3\x82\xaf\x2d\x8e\xe1\x0d\x73\x9b\x32\xdf\x4f\xf0\xf6\x8a\x32\x27\x58\x03\xe4\x14\x01\x80\x3d\x8e\x85\xb0\x56\x55\x40\xb1\x0a\x6b\xbc\xa6\xac\x63\xd0\x88\x00\x18\xc3\xe3\xa3\x50\x47\x6a\xe8\x99\x3d\x1e\x95\xfa\x6c\x26\xa3\x6a\x96\x7f\xc7\x27\x94\x14\xfa\x52\x7e\x06\x50\xcb\xa6\xe9\xf9\xa5\xfa\x3d\x8b\x5b\xab\xcf\x0e\x4d\xbf\x58\x3e\x8b\x5b\xab\xcf\x13\x4c\x09\xf4\x14\x55\x02\x7d\x1c\x57\x3b\xbe\x33\x4d\x7d\xb5\xc3\xaa\x1f\x68\x83\xba\x0e\x2f\xae\xf8\xfe\xf5\x95\x2b\x98\xf4\x38\xa9\x19\x52\xe8\xb8\xf2\x5c\xcf\x2b\x12\x22\xca\xd9\xae\xcf\xb8\xe4\xde\xbe\x27\x75\xc3\xce\x27\xd5\xe7\x76\x0a\x5e\xde\x63\xa3\xf3\x72\x58\x7d\x2e\x7b\x8e\x19\xdf\x64\xf0\x30\x87\x6d\xbd\x33\xb0\xf4\x17\x80\xa5\xaf\x08\x2c\xbd\x96\xef\x20\x4d\x5b\xa5\x43\x67\x57\xf6\x39\x22\x05\x82\x56\x5e\x9e\xd1\x0a\x70\x76\x91\xcf\xd5\x82\x75\x26\x53\x29\x5b\x77\x21\x0b\x3e\x41\x0b\xfa\x85\x26\x11\xbc\x4f\x1d\xc8\x5c\x6b\xac\x06\xc8\xe9\xb7\xba\x5b\xc9\xb3\x72\xac\x18\xd0\x18\xde\x4b\x4e\x00\x8b\xd7\x7f\x08\xd6\x78\x24\x9c\xe2\x78\x06\x88\xc0\xaf\x63\x46\x29\x1c\xcc\x03\x0b\xe3\x22\xb8\x77\xf9\xd0\xcd\x02\xee\x73\xd9\x4c\x47\x21\xad\x7b\x03\xb4\x9e\xc7\x70\xda\x69\x27\xa8\x14\xb6\x22\x9a\x9a\xc4\x16\xeb\xcb\x3b\xf6\x8d\x46\x84\x16\xdb\xbb\x3b\xf8\x52\xa3\xc0\x7e\xf1\xc3\x23\x0a\x26\xd2\x2b\x64\x56\xc9\x31\x79\x0b\x8f\xea\x5a\xda\xca\x60\x89\x52\x9b\x9e\xe6\x45\x5f\x41\xd1\x3c\xbb\x3b\xe5\xae\x81\x6a\x7e\x78\x9f\x51\x5b\x84\x60\x6a\x21\x2b\xf1\x03\xf3\x1a\xb9\x22\x80\xf2\xf6\x80\x78\x92\xb6\x61\x65\x28\x0d\xee\x13\x7d\x51\x03\x6f\xa0\x4f\x04\x73\x3b\xfa\x40\xa5\xbd\xcd\xf2\x95\x6f\x54\xfa\xd9\x04\x38\x86\xa3\x3b\xc6\x6e\xd5\x65\x21\x3a\xc7\x4f\xbb\xe4\x23\xf4\x32\xb8\x62\x38\x02\x85\xe7\x3b\xfc\xa4\x4a\xe0\x7e\x34\x94\xc3\xd1\x87\x4f\x39\x69\x20\xdf\xa4\x85\xa0\x4e\xf0\xfd\x2b\x0e\x87\x96\xbb\x46\x73\x28\xf2\xd6\x41\xc3\x90\x7b\xeb\x13\xd0\xf7\xba\x96\x62\x5c\xcc\x3f\x41\xfc\xff\xe5\x15\xe6\x70\x00\xfe\x2d\xe6\x23\xfd\xff\xbb\xbc\xc5\x3c\xb6\xcc\xba\xc7\x98\xf1\xd8\xec\x02\x97\x03\xe2\x7d\x1c\x39\xae\xa2\xfd\x8c\x1a\xe1\x3e\x45\x46\xec\xca\x47\x96\x37\xfb\x9a\xc5\x57\xac\x36\xd8\xa2\xe3\xfe\x82\xfb\x1c\x51\x6f\x52\x63\xfa\x64\x50\x3c\x04\xc9\x99\x7a\x8b\x24\x5f\xad\x11\xa9\x3e\x7b\x51\xaa\xf5\x68\x01\x93\x84\xba\x68\x2c\x6f\xf2\xa9\x57\xde\xd4\xba\xb5\x47\x43\x8e\x37\x77\x34\x6a\xa9\x24\x37\x7d\xed\xaa\xc8\x2c\x33\x51\xc0\x60\x2a\x92\x13\x5e\x9f\x97\x1c\x79\x7c\x14\xaf\xf1\x4b\x4a\xf3\xa7\x51\x18\xc1\x88\xb5\x99\xb8\xeb\xa0\x51\x00\xcd\xf2\xaa\x60\x2c\xe3\xf8\x54\xc9\x0d\xbf\xec\x2a\x39\xfa\x91\x4c\x7c\x1f\x53\x72\x96\x88\x1f\x42\x94\x1b\x1b\x9f\xce\xdf\x5a\xb7\x7d\xdf\x56\xcb\xa1\x9f\x7f\x56\xd7\x95\x4e\xa0\xcd\xed\xcf\xb4\x9b\x7e\x01\xb6\x1b\xac\xe1\xab\xe1\x4b\xed\x8e\x3e\x79\x32\x82\x93\x47\x02\x52\xf7\xba\xc5\x0b\xfc\xd6\xc2\x1d\xf3\xc8\xac\xe3\x6f\x31\x5f\x10\x8b\x29\xd2\xab\x53\x2d\xc1\xa7\x30\xd5\x3a\x82\x2f\x66\x1e\x5d\x05\x86\x9c\x7c\x5a\xd3\x17\x29\x5e\x51\x14\x20\x57\x9f\xe7\xed\xe5\xe5\x54\x79\x9a\xf6\xfa\xcd\x15\x25\x57\xed\x9d\x38\x8c\x74\x5d\xd8\x63\xa0\x1f\xa0\xb4\xef\x15\x9c\x5e\xb8\x4f\x7c\x06\x2b\xad\x4d\xf2\xe7\x03\xb3\xe0\xcb\xd8\xda\x38\x8d\xbf\xd1\x8f\x63\xa9\xc1\x54\x69\x95\x1f\x77\xe7\xe0\xdf\x7d\x67\xed\x04\x57\x91\x47\x64\xaf\xcf\xf8\xea\x0a\x4c\x0e\xa3\xd8\x72\x8b\x83\xc6\x1d\x4a\x21\xbd\x87\x67\x65\xd4\xc1\x57\x3e\xba\x1b\xb6\x15\x1c\x2a\xf7\x8c\x75\xf6\xae\x61\xfc\x08\x53\x08\x98\xc9\xfe\xb3\xb7\xd6\xa2\x86\x9d\x93\x69\x5a\x21\x7a\x74\x2d\xaa\x34\x1f\x06\x70\xdf\x73\x6b\x62\x14\x30\x65\xdc\xd9\xbc\x55\x19\x8f\x4d\xdf\x0a\x7b\xdf\xd7\x85\x03\x90\x5b\x71\xad\x05\x10\xf6\x5d\xf4\x00\x68\xfe\xeb\xb6\x0a\x30\xe6\x29\x9a\x3d\xfa\xe8\x69\xf4\xb5\x53\xab\x69\x1f\x6f\x6b\x06\xd1\xb6\xf1\x71\x45\xbd\x63\xf4\x1e\x99\x2c\x68\x19\xf8\xdc\x17\x86\x83\x22\xed\x88\x8b\xc2\x4e\x70\x42\xf1\xe7\x16\xef\xfd\x1a\xb2\x21\x98\x4d\xee\xab\x4c\x5e\xe0\x09\xea\xc0\xe0\xbf\x42\x18\xef\xb4\x12\x8d\x7b\x5a\x83\xc6\x7d\x04\x5c\x9c\xc0\xc6\xcf\xaf\xf0\x4b\x58\x88\x1b\x31\x87\x96\x29\x15\xd9\x84\x25\x6f\xfc\x2d\x8a\x10\x07\xc5\xd2\x13\x86\xfb\x42\xe5\x2c\x69\xf8\x2f\x7c\x87\xdd\xf2\xb7\xb9\x83\x83\xc0\xe7\x86\x47\x9a\xcf\x0d\x3f\x01\xee\x73\xe7\xbe\xc9\x3d\x2d\xf5\x9e\xf9\x6f\x39\x36\xe5\xc1\x5e\x3e\x53\xde\x3d\xc0\x87\x58\xbf\x0b\x6a\x84\xdf\xf3\x8e\x73\xc7\x6d\xe8\xe7\x43\x47\x4d\x18\xb3\x8c\xb6\x4c\xb5\x3a\x82\x18\xf7\x15\xc1\xe8\x75\x66\xa0\x5f\xbe\x46\xab\xc7\x4a\xf4\xf9\xe0\x31\x31\x7b\x66\xeb\x48\x39\x64\xb4\x36\x30\x0e\x69\x8f\xbe\xab\xab\xdf\x72\xd3\xd8\x76\xf7\xe5\xc2\x5f\x90\xed\x47\x38\xfb\xd1\xdc\xf1\xd7\x72\x39\xe8\xdc\xaa\xc4\x9f\x37\x9e\x7e\xd7\x58\xc1\xec\x89\x78\x58\x04\x26\xaf\xc9\xc3\x14\xa0\x8f\xc9\x1b\x63\x90\x2b\x4e\x1c\xdf\x9d\x6d\xd5\xfc\x2d\xd7\xa0\x10\xe5\x9d\xbe\x81\xbd\xdb\x8d\x3b\xfa\xc4\x5a\x54\x49\xbe\xec\xe6\x3e\xe3\x34\xad\x6c\xb7\xf5\xdc\x22\xda\xed\xa3\xd9\x45\xfc\x6d\x28\x07\x6a\x5c\xbe\xbd\xc6\x0f\x99\xd1\xcf\xf4\x0d\x7e\xba\xb5\x92\x6b\x45\xd0\x86\x39\x98\xf9\x99\x5d\x34\x82\x52\x4c\x39\x6e\x95\x3e\x57\x7b\x3e\x96\xf5\xdb\x33\xbc\x38\x94\x83\xb3\xf9\xcf\xc8\x09\x91\x1c\x72\xe6\x0b\xfc\x9e\x1f\xa0\xc2\x4e\xa5\xc0\xb8\xdc\x08\x8a\xe8\xbc\x09\x88\xe9\xd5\xaf\x6f\x2e\x47\x90\x33\x1b\x54\x4b\x66\x36\x74\xfc\x6d\xed\x70\xfb\x8a\x2b\xc7\x4d\x01\xee\x9b\xf9\x19\x08\xe4\xd1\x09\x08\x0d\x79\xcf\x2c\x88\x67\xb6\x21\xa5\xb6\x22\xdf\xcb\x8e\x51\x3a\x93\xdf\x31\x50\xf0\xba\xa3\x40\xd9\xe3\x8e\x93\x5e\xeb\xb0\xcf\x5a\xdc\x10\x9e\x1f\x48\x88\x40\xc0\x0f\x24\xd4\x76\x76\x78\x06\x4d\x2a\xeb\x6d\x55\xa8\xe0\x28\xf0\xef\x34\xcb\x40\x0d\xc4\xb7\x6c\x10\xda\xb4\x1b\x26\x11\x6e\xe5\xa4\xb7\x33\xfc\x8a\x96\x4e\x37\x22\xef\x17\x81\xf5\xdb\x90\xdf\xa6\x97\x1a\x06\xbc\x5e\x39\xc4\x98\x41\xe9\xe5\x99\x7f\xf7\x12\xb6\xa7\xd1\x64\xb6\xd5\x4d\xe9\x2c\x55\x3a\x9b\x37\x94\x17\x01\xf3\x47\xf1\x3b\xbb\x10\x29\xdf\xf7\xe3\xcf\x6a\x8f\x26\x11\x36\xa5\x33\x99\xb4\xb4\xaf\x60\x3d\x0c\xf0\x22\x19\xf3\x18\x37\x68\xe5\xdb\x01\xb8\x32\xee\x31\xbb\xb5\xef\xe3\x04\x3b\xc4\x7f\xac\xc2\x9f\xcf\xae\x77\x3e\x97\x67\x7b\x66\x28\x3d\xb9\x18\x06\x27\x97\x45\x0b\x2c\x56\xad\xbc\xad\xc2\xff\xae\xd9\x8f\xeb\x4a\xc2\xbd\x67\x79\x1d\xd1\x5e\x31\xc8\x65\x1b\x4d\x7a\x78\x1f\x5d\x20\x68\xb2\x82\x99\xe7\xc4\x62\x80\xf2\xf7\x72\x35\x04\x6e\x85\x5f\xe5\xb7\xda\xf1\x7c\x33\x8d\x05\x07\x0e\x35\x1e\x3c\x7b\x27\x39\x01\xcc\xdc\x03\x4b\x36\x74\x84\x38\x5a\xa8\xe3\xd1\xfe\x5d\xf7\x50\x7f\x18\xca\x22\x2e\x2c\xca\x41\x7e\x66\x5b\xb9\x7b\x31\x0a\xc2\x30\xd8\x50\x0a\x09\xf3\xb2\xef\x23\x39\xcd\x95\xcd\x0c\xdc\x8a\x1a\x7c\xf9\x7d\xbf\x08\x60\x21\x8a\x07\x2f\x8f\xcb\x18\xa4\xfc\x4b\x21\x56\xc9\x47\x89\x69\xf8\x34\x7a\x9c\xd6\xcc\x8f\x41\x18\x4d\x74\xff\xe7\xa1\x3c\x11\x27\x97\xa4\xac\x12\x47\x10\xc9\x13\x77\x01\xec\x93\xae\x5d\x3d\x79\x18\x3e\x2c\xc7\x16\x21\x0f\xc0\x0f\xd1\x71\xe1\x8f\xfa\xea\x9c\x8e\x03\x46\x0d\x6a\xf3\x6f\xfa\x60\x9d\xfc\x0e\xdb\x15\xb3\x87\x34\xdd\xfd\x27\xd7\xfa\xdf\x12\x0d\xb6\xf0\x4d\x68\x06\x1e\xaa\xff\x23\x0d\xb9\x37\x3c\x74\x7e\xf6\x7b\x84\x17\x5c\x99\x66\x84\xc8\xdd\xe9\xf1\xd7\x0b\x14\x55\xb8\x79\xcd\x37\x71\x3c\x9e\xe8\xc7\xfd\x88\x8a\x9a\x9a\x20\xaa\xd9\xf1\x1d\xc4\xec\x87\xcc\xbf\x72\x89\x4b\x78\x52\x50\x75\xfa\x2e\x96\x7c\x1a\xe2\x07\xf7\xc2\x65\xf2\xb1\x6f\x9a\xed\xa7\x24\x5f\xf3\x9c\xe8\x6f\x82\x27\x64\x25\x5e\x17\x31\x69\x94\x4c\xe4\x27\xa7\xbe\xe7\x86\xbf\x27\x2d\x95\x18\x08\x1e\x67\xfb\x7e\x87\x0c\xf9\xb8\x30\x32\x36\xc8\xe0\xb7\x87\xf1\xb3\xc0\xcf\x22\xbf\xc3\xaf\x03\x7e\x1d\xca\xf2\xb3\x54\x06\x87\xa1\xea\xa4\xf5\x6d\x90\x73\x87\xdf\xfc\xda\x18\xbe\xec\x8e\x7e\xf4\x59\x3f\xfb\x81\x27\xe1\xe4\x5b\xc6\xc8\xb7\x1f\x94\x2f\x5f\xf9\x78\xe6\x3f\xf8\xf1\x90\xfd\x63\x77\x9a\x85\x14\xe5\x70\xf7\x9a\x25\xc9\x87\x60\x13\xa4\xcb\x6a\x83\x92\xa6\x5c\x1e\x87\x66\x4a\x92\xf2\xda\xfc\x90\xf9\x71\x69\x0a\xb9\x7e\x54\x9a\x4a\xfe\x5f\x00\x00\x00\xff\xff\x59\x84\xf7\x7d\x91\x8c\x00\x00") +var _confLocaleLocale_enUsIni = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xc4\x7d\xeb\x72\xdc\x46\xb2\xe6\x7f\x3c\x05\xac\x0d\xad\xec\x08\xaa\x15\xb6\x63\x2f\xe1\x90\xe4\xa5\x49\xeb\x32\x47\x14\x75\x44\x6a\x66\x67\x15\x0a\x0c\xba\x01\x76\x63\xd4\x0d\xb4\x71\x61\x9b\xf3\x6b\x5f\x63\x5f\x6f\x9f\x64\x33\xbf\xcc\xac\x0b\x80\xa6\xe4\x39\x27\xf6\xfc\x21\xab\xab\xb2\x6e\x59\x59\x59\x79\xab\x42\xbe\xdf\x67\x45\xd9\xad\xd2\x67\xe9\x69\xba\xcf\xab\x7a\x5b\x76\x5d\xda\x95\xdb\x9b\xc7\x9b\xa6\xeb\xcb\x22\x7d\x59\xf5\xf4\xbb\xbd\xad\x56\x65\x92\x6c\x9a\x5d\x49\xa0\xaf\xe8\x5f\x52\xe4\xdd\x66\xd9\xe4\x6d\x41\x19\xe7\x96\x4e\xca\xdf\xf7\xdb\xa6\x65\xa0\x5f\x25\x95\x6c\xca\xed\x9e\xeb\xd0\xbf\xa4\xab\xd6\x75\x56\xd5\xf4\xf3\x8a\x52\xe9\xeb\x3a\xe9\x9a\x55\x95\x6f\xb3\xa0\x00\x19\x56\xfe\x53\xfa\x43\x5d\xa4\x57\x7d\xb9\x4f\x9f\x76\xbb\x7c\xbb\x7d\x9e\x77\xa8\xd2\x97\x69\xbe\x5a\x35\x43\xdd\x3f\x7d\x22\x05\xd2\x78\x33\xf4\xd6\xfa\xe5\xd0\x4b\xde\xb0\xb7\xac\x0f\xfb\xa4\x2d\xd7\x15\x4d\xac\xa5\xac\xf7\x9a\x4c\x0e\xe5\xb2\xab\x7a\x1e\xf4\x5f\x24\x95\xdc\x96\x6d\x57\x35\x3c\x9e\x3f\x4b\x2a\xd9\xe7\x6b\x06\x78\x47\xff\x92\xbe\xdc\xed\xb7\x39\x2a\x5c\x6b\x32\xd9\xe6\xf5\x7a\x10\x98\x37\x9a\x4c\x92\x81\x30\x57\xe7\xc0\xd9\x07\x4d\x26\xe5\x2e\xaf\xb6\x8c\x9f\xc7\x9c\xa0\x76\xbb\xee\xd0\x00\x8b\xef\x34\x49\x63\xcc\xfa\xbb\x7d\x89\x21\x3e\xbe\xa6\x54\xb2\xca\xf7\xfd\x6a\x93\x53\xce\x99\xa4\x12\x02\xda\x37\x34\xd6\xa6\xbd\x03\x9c\xfd\x48\x9a\x76\x9d\xd7\xd5\x3f\xf2\x5e\xc6\x7f\x19\xfc\x4c\x76\x55\xdb\x36\x3c\xf5\x0b\x24\x92\xba\x3c\x64\xdc\x0e\xe5\xbc\x2d\x0f\x61\x2b\x5c\xb2\xab\xd6\xad\xcc\x92\x0b\x2f\xf0\x8b\x5b\xe1\xb2\x9b\xa6\xfd\xac\x05\x2f\x38\x39\xaa\x4a\x83\xd0\xd2\xb8\xff\xbc\x26\xbc\x68\xe9\x05\x7e\x44\x00\x5d\x92\x17\xbb\xaa\xce\xf6\x79\x5d\x32\x8e\x4e\xf9\x17\xe1\x85\x7e\x25\xba\xdc\x59\x57\xf6\x7d\x55\xaf\x3b\x2e\x96\xac\xf4\x4a\xb3\x92\xa0\xcc\xe5\xf1\x78\xba\xec\xa6\x2c\x0b\x19\x51\x97\xbe\xa0\x74\xb2\x1f\xb6\x5b\x9a\xfb\x6f\x43\xd9\xf5\x0c\xff\x8e\x7e\xd3\x2c\xe4\x77\x52\x75\x1d\x25\x28\xfb\x35\x12\x09\x2d\x40\xbd\xc2\x90\xce\x90\x48\x92\x8f\x5d\x99\xb7\xab\xcd\xa7\x44\xfe\xa3\x47\x4e\x2c\x16\x8b\xa3\x4b\xc3\xe4\xa0\xa4\x20\x3d\x58\x07\xc9\xaa\x29\xf8\xc7\x19\xfd\xa3\xa6\xab\xba\xeb\x89\xa4\x3f\x25\x9a\x60\x30\x49\x09\x1a\xfb\xaa\xdf\x96\x3e\x13\xfb\xa3\xe3\x75\x48\x5f\x54\x6d\xd7\x3f\xee\x2b\x22\xb9\xf7\x43\x9d\xf0\xfc\x88\x9c\xb3\x62\x69\xbb\xfc\x65\x43\xd8\x41\x76\x4b\xf3\xbb\xb8\xbb\xfa\xd7\x37\x27\xe9\x3b\xda\xea\xeb\xb6\xa4\x74\x4a\x6d\xd0\x3f\xaa\xf3\xe3\x22\xa1\x5a\xd6\xd3\x79\xde\xe7\xcb\xbc\x2b\x3d\x5a\xb9\x50\x68\xd4\x95\x81\x52\x99\x6d\x80\x45\x74\x7d\x34\xdf\x39\x3a\xa7\x36\x74\x77\xb8\x36\xde\xf2\x16\xa1\x7c\xe6\x1a\xa8\xfc\x6e\x5b\x72\x3e\x35\x95\xbe\x7e\xfb\xf6\xf2\xfc\x97\xb4\xac\xd7\x55\x5d\xa6\x87\xaa\xdf\xa4\x43\x7f\xf3\xdf\xb3\x75\x59\x97\x2d\x31\x91\x55\x95\xd2\xce\x68\x89\x08\x52\x22\x4f\x99\xdc\x22\xe9\xba\x6d\xb6\x13\xf4\x5e\x5d\xbd\x49\x2f\x18\xc5\xfb\xbc\xdf\x60\x20\xfd\x26\xe9\x7e\xdb\x32\x8a\x5c\x87\xd7\x9b\x32\xbd\xa9\x68\xd6\x00\x6a\x6e\x0c\x1f\x69\xa1\x63\x5c\x24\x65\xdb\x66\xb4\xef\xfb\xbb\x4c\x2b\x6b\x7b\x63\x48\x69\x82\x48\xa7\x6e\xfa\x74\x59\xa6\xa8\xb3\x48\x12\x1b\xb0\x61\xf7\x74\xbf\xdf\x56\x2b\xd9\xb1\x2f\xa5\xcc\x23\x9a\x59\xb4\x62\x29\x84\x03\xa2\xac\x2c\x40\x17\xf1\xbf\xbb\x66\x68\xd3\x88\x0d\xa0\xfe\xa6\x24\xbe\xbc\x19\x68\xcb\xe5\xc4\x53\xb7\xcd\x50\x7c\x03\x4a\xb5\xd1\x7b\x42\x4d\xdf\x37\x34\x60\x60\xc7\x01\xf8\x2e\x4e\x89\xe2\xf8\x54\x68\xcb\x5d\x43\xdc\xc1\x11\x7b\x45\x04\x75\xa8\xa8\x90\x66\xda\xe5\xb7\xb4\xdf\xfa\x26\xed\x37\x55\x97\x16\x44\x6c\x2b\x6e\x98\xb6\xc6\x40\xfc\x58\xc8\x82\x08\x54\x48\xc3\xf2\xe2\x35\x00\xd4\x6e\x20\x6a\xda\x50\x63\xcc\xed\xf9\x68\xa2\x26\xe7\xc6\x89\x29\x51\x3b\xa0\x6f\xa2\xdc\x86\x78\x2b\x73\xbf\x73\x24\xf4\x77\xd8\x3e\x8d\x2a\xbf\xb9\xa1\x51\x75\x44\x15\xaf\xd2\xd5\xb6\x21\x92\xfa\xf0\xfe\x0d\x55\xde\xf4\xfd\x3e\xdb\x37\x2d\xc8\xf8\xfa\xfa\x1d\x6d\x8f\xb6\xf7\xb9\x01\xae\x19\xa6\x1e\x76\x4b\xfa\x75\xd8\x54\xc4\x04\xf2\x60\x81\x80\x8a\x2d\x1f\x30\x75\xda\xd4\x0b\xac\xd5\xd0\x6e\x47\xcb\x48\x5d\x5a\xc9\x91\xe1\xf1\x10\x9e\xf0\x9f\x2b\x3f\x4a\x4c\xb7\xa3\x53\xf8\x80\x45\xa5\xa9\x96\x38\x4d\x88\xb6\x9a\x3d\xb7\x1b\x10\xd7\xa5\x66\x78\x8a\xc2\x09\xe4\xca\xe5\x1c\xa2\x52\x9c\xf1\x01\x2f\xdd\xd1\x84\x75\x37\x5f\x5d\x10\x1a\xb0\xa5\x91\x7b\xd3\x36\x3b\xca\x7d\x41\xff\x7c\x86\x1f\xfe\x05\xb7\x07\x98\xbc\x28\x88\xcd\x74\x27\xe9\xfb\x17\x67\xe9\x7f\xf9\xf1\x87\x1f\x16\xe9\xeb\x9e\x37\x04\xd3\xc8\xdf\x79\x6d\x29\x29\x07\xa2\x03\xa5\x9d\xdb\xd3\xf2\x3f\x60\x02\x7f\x90\x3e\x45\xe9\xff\x28\x7f\xcf\xe9\x9c\x2d\x17\xab\x66\xf7\x9c\x37\xf7\x2e\xef\x17\x09\x97\x10\xd5\x28\x39\x5d\x95\x75\x41\x09\x3d\x56\xb5\x2c\xe0\x3a\x5a\x1e\x1c\xb2\x72\xfa\x67\xab\xa6\xbe\xa9\x5a\x9e\xd0\xaf\x75\xbe\x24\x9c\x98\x5c\x40\xec\x18\x25\x76\x76\x11\xd2\x68\x23\x57\x37\x77\x1e\x14\x53\x7d\xcb\x99\xba\xa0\x09\xcb\x4a\xd4\xa8\x8a\x4c\x0e\xcb\x57\xc8\xc6\xba\x5d\xd2\xf4\x5a\xc3\x77\xe7\x11\xde\xdc\xdc\x6c\x89\xb1\x19\xb3\xd2\x1e\x2e\x25\x57\xf8\x56\x08\x42\xc4\xb8\x87\x64\x73\x5e\x75\x80\x3c\x3b\x7f\x9b\x96\xb7\x44\x6d\x44\x0e\xfb\xb6\x29\x86\x15\x28\x8c\x61\x4f\x52\x3e\x26\x08\xbf\xc4\x19\x56\xc2\xde\x82\xbd\xca\x43\x63\x86\xb0\x22\x20\xda\xa2\x85\xb4\x97\x09\x82\x5a\x13\x24\xac\x9b\x2b\x16\x0e\xc3\xb2\xd9\x0a\x93\xd1\x61\x95\xba\x71\x5d\x5a\xee\x7a\x7b\x97\xe2\xd4\x07\x5d\xac\xda\x32\x90\xed\xba\x45\xa2\x67\x95\x49\x88\xd9\x6d\x45\x42\x45\xb0\x54\x28\x35\x71\x91\xd9\xc3\x9f\x19\x80\xc5\xb4\x6e\xb6\xae\x1b\xd8\x25\x77\xcc\x25\x34\x77\xea\x9c\xc7\xd7\x61\x08\xe8\x81\xc5\x3d\x22\xc6\xdb\x0a\x9c\x46\x91\x85\xb1\x12\xc6\xd0\x35\x75\xd5\x95\x25\x5a\xa0\xfa\x4f\xa8\x4d\xd4\x59\xa8\x08\xa3\xa2\x88\x9d\xbb\x7f\x6d\x86\xb4\x68\x52\x3e\x08\xc0\xce\xa8\xb6\x4d\xb5\xd6\xe9\xeb\x9c\xd3\xb6\x5a\x6f\x88\xaf\x34\x87\x13\x41\xda\x61\xd3\x94\x4c\x3b\xaf\xcf\x9f\x7d\x2f\xe3\x58\x33\x73\x73\x95\x98\x2d\xe6\x43\xdf\x30\x9d\xea\x12\xca\x10\xdc\xf1\x02\xc8\x89\xb0\x24\x40\x63\xf1\xd4\x04\xb0\xe9\x69\xad\xfb\x24\x2c\xd3\x0d\xe2\x61\xa4\xf6\x48\xc4\x55\x29\x26\x5b\x37\x90\xcc\x4c\x6a\x61\x56\x4d\xa2\x74\xd7\x67\xeb\xaa\xcf\x6e\x78\xc3\x72\x9b\x2f\xb8\x2e\x9f\x1c\x54\x92\x3e\xa2\xa2\x47\x29\xed\x7a\x92\x1c\x8b\x9f\xd2\x87\xb7\x7a\x5c\xff\xc8\x3b\x31\xcb\x6f\x09\x16\x8b\x01\x04\xb7\x44\xe1\x22\x2d\x98\xf8\x5e\x34\x44\xe7\x8c\xf3\x6e\xd8\x83\xa3\xeb\x09\x7d\x92\xee\x05\xb0\x68\x0e\xf5\xb6\xc9\x0b\xb0\x1c\xda\x5d\x15\x94\x8f\x65\x55\xe7\x74\xba\x58\x2b\x60\x65\x0f\x89\x1a\xde\x5e\x5e\x03\x70\xdd\x2c\x87\x6a\x5b\x18\xc0\x82\x66\x78\x9b\x6f\xab\x82\xe5\x2c\x5d\xf7\x50\xa6\xb1\xac\x4a\xc6\xb2\x6a\x5a\x3e\x0e\x31\x1b\xab\x78\xe4\x1c\x6e\xf9\x7c\x43\x36\xd5\x55\x58\xd4\x73\x47\x26\xa3\x81\x16\x1e\x02\x28\x1f\xa8\xa0\x98\xaa\xab\x1f\xf5\x18\xe9\x6a\xa0\xbe\x68\xd1\x39\x9b\x2a\x76\xe9\xe3\xe7\xf4\x37\xe1\xe3\x59\xf8\xde\x7a\x8a\x78\x2e\x4c\xa5\x70\x90\x5d\x1a\x0d\x35\x22\x6f\x47\x5d\x46\xbc\xc1\x5c\xc3\xf1\x1a\x09\x74\x83\xd0\x2b\x6b\x5a\x5b\x5a\xd6\xf2\x1b\x4a\x3c\xa2\x0d\xbc\xde\x62\x11\x72\x48\x2f\x24\xc6\x35\x84\x37\x26\x90\x13\xd9\x2e\x37\x34\x35\xe6\x9d\x7d\xfe\x99\xc6\x96\xb7\x24\x84\x25\x1f\x59\x1b\xfd\x94\x0c\x22\x00\x35\xdb\xc2\x09\x9b\xa0\xe9\xa6\x1d\xab\x58\x1e\xc8\xd1\x6b\x47\x52\xe4\x6a\x93\x39\x5d\x96\x91\xd2\x97\xbf\xe3\xcc\x43\x91\x57\x6d\x99\xd8\xb9\x28\xd9\xdd\x61\xb9\x78\x12\x17\x77\x7e\xb5\x48\xfc\xa1\x2d\x42\x22\xfa\xb2\x61\xac\xdd\x96\x0e\xea\x2c\xcc\x8d\x2b\x50\x5b\x24\xa8\x69\x53\xb1\x26\x44\x45\xa2\xae\x69\xa9\xa8\x6c\xa4\x8a\x7c\x54\x1d\xfb\x53\x62\x1d\x44\x4d\x26\x1f\x89\x19\x90\x5e\x22\xec\x25\x63\x6d\xcc\x16\x87\x86\x22\x3c\x87\x15\x33\xe5\x07\xfe\x1c\xdc\x94\x7b\x3e\x32\x77\x1d\x56\x75\x4b\x90\xc5\x9d\xca\x5e\x6e\x7d\x7f\x16\x4e\x4b\x0b\x4e\xfc\xe9\x1b\xd3\xde\xff\x60\x13\xbf\x54\xb4\x92\xa8\x1f\x9f\x1c\x7c\x5e\xd3\x56\xdb\x03\xfb\xb4\x49\xee\x4e\xd2\xe8\x0c\xda\xe4\x1d\x71\x5f\x3a\xe0\xb4\x5a\xb1\x30\xed\x80\x57\x2d\x5f\x09\xc9\x43\x93\x07\x91\x4a\xcd\xa6\x1d\x1f\x69\x3c\x42\x61\x50\xda\x8b\x3b\xf0\x71\x9c\x87\xa7\xfe\x4c\x9f\x84\xb0\x5d\xc9\x32\x5f\xb6\x13\x0d\x5d\x7e\xa5\x17\x65\x42\x82\xc9\x9a\xf6\xa3\xd1\xdb\x33\x56\xc9\xd6\x90\x50\x95\xdc\x18\xa0\xec\x43\x0e\xaa\x10\x96\xf3\xb3\x59\x2c\x68\x63\x1f\xa0\xaf\xd2\xd6\x9c\xa0\x9f\xce\x1a\x2a\x5e\x18\x47\x96\x03\x17\xf2\x49\x47\x9b\xdd\x23\xf1\x34\xa5\xd5\x4f\x43\x28\x95\x13\xfd\xb4\xb8\x02\x6f\xfa\xa7\xcb\xe7\x0f\xbb\xa7\x4f\x96\xcf\x1d\x6b\x5c\x6d\xca\xd5\x67\xd1\x25\xaa\x7a\xd9\xfc\x0e\x85\x8b\x16\x9e\x71\x5c\xf3\x16\x79\x58\xa4\x1b\x2a\x85\x4c\x4e\x5b\x99\xaa\x11\xe2\xb9\x34\x5a\x34\x1a\x0c\xef\xf8\x85\xd9\x7e\xdc\xe1\x60\x84\x44\xb5\xd1\x89\x8c\x8c\xd4\x7c\xec\x1d\xce\x0a\xe8\xf6\x94\x73\x99\x72\xc1\xe6\x3d\xe9\x62\xbe\xdb\x6a\x57\xf5\x13\xd2\x61\x3e\x92\x2b\x09\xaa\x9e\x6f\xb8\x44\x5b\xc0\x06\xc6\x42\xdc\x98\x9a\xa1\x73\xd3\xc8\xe9\x90\x93\x7a\xf3\x63\x4a\x24\x34\xd0\x29\xc4\x73\xa2\x61\x12\x3b\xce\xf9\xe0\x25\x05\x21\xef\xb2\xa1\x56\xb4\x96\x85\x11\xd3\xab\x0a\x87\x04\xf7\x6b\x24\x1f\x40\x19\xe6\x55\xce\x4d\xbf\x75\x18\xff\x8e\x84\xe2\x1b\x57\x8d\x39\x37\x0f\xa8\x62\x99\x2c\x9f\x5d\x3c\xe2\x6c\x75\x29\xea\x15\x30\xc0\x70\xbc\xd0\xa4\x1c\xf8\xd5\x23\x0d\xe3\x33\xe5\x60\x41\x96\x43\xdf\x37\x2c\x73\x6f\x99\x6a\xa4\x8e\x8d\xfa\x0c\x80\x50\x23\x7c\x7b\x58\x90\x10\x4f\xb2\x36\xa5\xc9\xc0\x99\xb7\xc2\xa9\xb6\x32\x9a\x9d\x1e\x75\x0e\xac\x10\x75\x3d\xaf\xef\x8c\x94\x89\x20\x78\x14\xdc\x61\x3f\x3f\x96\x6f\xdb\xf2\x3b\x3f\x1a\xb7\x67\x50\xc3\x46\x24\xd5\x83\xfd\xf4\x1e\xa5\xa0\x12\xb7\xeb\xec\xe4\x52\x23\x8b\xa7\x8f\x36\x46\x2f\xca\x79\x67\x10\x83\x25\xb1\xb1\x00\xa2\x69\x16\xa8\xbd\x18\xf5\xe5\xd5\x9d\x29\x06\xfb\x78\xc8\xfe\x00\xea\x9b\x26\xeb\x36\xa2\x5a\xda\xf0\xd2\x6d\x59\xaf\x23\x33\x01\x6c\xb0\x20\xba\xff\xca\xc7\x1c\x09\xf0\xf9\xf6\x53\x72\x07\x7b\xd4\x5f\x89\xc3\xd7\xb0\xd7\x35\x09\x15\x88\x32\x72\x81\x04\x81\xb2\x66\xf4\x29\xe1\x23\xf0\xed\x48\xac\xe3\x23\x42\xf3\x02\xf9\x02\x45\xbf\x46\xd2\x9a\x2d\x61\xf2\x6e\x46\x04\x7c\x5f\x7a\xbb\x24\x52\x6e\x8a\xa4\x44\x5f\x9b\xaa\x43\xfa\xf4\xe7\x52\x1b\x7f\x45\x6a\x73\xf7\x01\x6a\xaf\xe8\xb0\xac\xf0\xbe\xcb\xef\x58\xe8\x92\x6c\xfd\x81\x82\xeb\x32\xdf\xe9\x28\x39\x29\x4d\x9c\xd2\x71\xa6\x99\x9c\xa4\x53\x2e\xb0\x6a\x24\x10\x3f\x6c\x0a\x22\x8b\xe8\xb1\xef\xc4\xff\x52\x8d\x9e\x7f\x9b\x98\x62\xfe\x96\xe4\xdb\xfd\x26\xc7\xf9\x1f\x80\xc1\xea\x40\x40\x58\xf8\x14\x20\xa0\x85\x61\x57\xb6\xd5\x8a\x93\x5c\xe1\xdb\xc7\xd9\x77\x30\x38\xd1\x46\x21\x41\x30\x6e\xac\xa0\x4d\xf2\x4f\x35\xc8\x69\x16\x12\xc3\x76\xbb\xea\x1f\x36\x8b\xa8\x39\xce\x27\x9e\x43\x10\x10\xc9\x3c\x94\x03\xc2\xc1\xc8\xe2\x59\x9f\x32\x5f\xe8\x59\x04\x8c\x9a\xde\xe5\xbf\x7f\xa9\xe2\xae\x99\xa9\x27\xac\xc0\x57\xb2\x0d\xaf\x53\x8c\xd9\x01\xc1\xb3\x7d\xe3\x28\x34\x2d\x3d\x83\xd4\x9f\xe9\x54\xab\x1d\xd8\x07\xf9\x9d\xe2\xf7\x4f\x66\x02\xa7\x23\x44\x05\xe8\xd4\x19\xc3\xe9\x70\x2e\x98\x6f\x42\x10\x5e\xf8\xed\x16\x0a\xc7\x8e\x9c\x59\x8c\x34\x95\xdf\x31\x0e\x92\x28\x45\x4f\x20\x92\x5a\x78\xbb\x7d\xc6\x67\x64\xc6\x42\x67\x1d\x8a\x96\xee\xf4\xb4\xf3\x05\x10\x62\xf7\xcd\xa6\xf5\x46\x1b\xee\x68\x75\x12\x05\x66\x6a\x5f\x4e\x0d\x79\x47\xea\xf7\xb4\x65\x66\x1a\x70\x3b\xe9\x68\x45\x59\x4c\x54\xa2\x99\x17\x13\x5e\x30\xad\xc8\x60\xa4\xf6\x6c\xb7\xe5\x9a\x4d\x4d\xd6\x71\xd4\x9b\x92\x10\x1d\x06\x02\x16\x12\x90\xc7\xb0\x5b\xac\x70\x5d\x43\x21\xde\xad\x51\xac\x3e\xd1\xa8\x49\x1c\xa7\x24\xd7\x0c\x94\x28\x1d\x86\x9e\xe4\x3b\xd6\x17\xba\x81\x59\x33\xeb\x16\x22\x9d\xc4\xab\xc1\x07\x2f\x9a\x2a\xd1\xc5\xf1\xe6\x89\x16\x59\xe1\xfa\x52\xfb\x00\xfb\x83\x4d\x87\xea\xf6\xb4\x61\x6d\xdc\x01\x1d\x6b\xd6\x29\x84\xe5\xef\x15\xcc\x76\x2f\x2b\x36\x07\x41\x25\x74\x9a\x30\xca\x16\xc9\x96\x98\x01\xab\x1e\x32\x2b\x91\x63\x9b\x5b\xd6\xdc\xb8\x3f\x2e\x95\x7a\x62\xc6\xd3\x49\xf1\x3a\xab\x72\x49\xca\x5c\x73\x28\x8b\x13\x3a\xe2\xb9\x06\x8d\x13\x6c\x23\xdf\x1e\xf2\xbb\x0e\x36\x12\xe3\x38\x6c\xb2\x94\xea\xcc\x4e\x48\x00\x58\x63\x54\xa1\x7d\x9a\x76\x9c\x61\xa2\x23\xde\xc9\x87\x87\x3b\xa6\x0f\x50\x0f\xc1\x2d\xd4\xea\x42\x5a\x37\x1f\x7b\x38\x62\xf5\xac\x61\xd5\x96\x15\x41\x96\xf1\xa5\x38\x68\x08\x2e\x0f\xe5\xfc\x33\x75\x4f\x58\x3c\xa2\x6e\x58\x58\x21\x7e\x2c\xb8\x26\xf9\x8f\x30\x8b\x21\x05\xb6\x82\x81\xda\x7f\x2c\x72\x71\x45\x38\x64\x3d\xcb\xab\xcf\x7c\x36\xd1\xaa\x98\x61\x57\xf2\xa1\xfc\x26\x5d\x4f\x5b\x80\x31\x6d\xce\xb6\xbf\x8a\x7c\xa5\x2a\x33\x97\x62\x8b\x01\x4d\xdd\xa6\xda\xa7\x0d\x8c\x85\x21\x0a\x3d\xd9\x06\x22\x26\x61\xa3\x28\x21\x77\xb3\xd5\xb4\xcd\xeb\xee\xa6\x84\xf9\x74\x97\xde\xb0\x27\x68\xa1\x5d\xb3\xc4\x2a\x4e\xb7\x23\x3d\x8b\x0e\x83\xae\xc3\xd3\x02\x6b\x17\x2c\x54\xdc\x35\xc1\xdc\xa2\x67\x1d\x03\xb0\xea\x5b\xea\x6c\x0c\x4c\x66\x13\x14\x40\x6a\x8c\x9c\x14\x36\x9a\xdb\x32\x44\xc4\xcd\x3f\x3b\xf3\x00\xeb\x6a\x21\x16\xb3\x7a\xbc\x4c\xd2\x29\xac\x15\xf0\x31\x2d\xef\xe2\xd9\x73\x55\x47\x01\xec\xf1\xb8\x2d\xb5\x17\xde\x18\xbc\x57\x46\x0d\xc2\x4a\xe1\x75\x85\xa4\xcf\xa1\xf2\x2d\x69\x88\xab\x4d\xb4\x3b\xaf\x51\x92\x4a\xc9\x64\x83\x26\x1f\xb9\x6b\x52\xe3\x37\x79\xbd\x2e\xd9\xd4\x45\x2d\xf1\x91\x87\xdf\x2a\xa1\x4b\x26\x0d\x78\xdd\x4a\x9a\x0d\xe4\x56\x65\x45\x1b\xb2\xd9\xdd\x5b\xb3\xaa\xcd\x60\xd3\x25\x7f\x6f\x48\x86\x80\xa5\xf7\x4f\x94\x62\xe9\xb7\x4e\x22\xdf\xce\xc8\xce\x00\xf5\xa0\xea\xef\xe0\x74\x5a\x92\x0c\x2c\x4a\x1a\xe5\x90\x9a\x0b\xee\x00\xcb\xc5\x0b\x4b\xd3\x7a\xe4\xcc\xf4\x78\x6b\x4b\x4a\xe1\xc4\x8c\xf4\xc2\xd2\x09\x6b\xc9\xbb\x05\x0e\x07\x16\xa6\x61\x9c\x0e\x8e\x84\x47\x0f\xbb\x47\xbc\x60\x56\xb6\x08\xe0\xf7\x79\x4f\x6c\xb1\x16\x15\x45\x38\x54\x58\x55\x8b\x5d\x13\xe0\x2a\x02\xb6\x80\x47\x57\x50\xf1\x29\x21\x5d\x12\x2e\x40\x9a\x9a\xa4\x66\xdd\x97\xca\x62\x3a\x95\x79\xff\x85\x92\x6a\x11\x49\x5d\x1c\x83\xaa\xaa\x70\xe3\x99\xd3\xa7\x8b\x7d\x40\x5d\xa2\x26\xa0\xd8\xfe\xa3\xe4\xfd\x2c\x3d\x97\x84\x29\xbd\x43\x85\x39\x55\x45\x92\xec\x81\xf7\x2c\x18\xad\x2c\x84\x1b\xb4\xfc\x0f\x6c\xd0\xed\xf8\x64\x27\x2c\x48\x2b\x20\x5c\x73\x09\x40\x0a\x60\x1f\x6a\xa0\xb0\xb1\x71\x15\x9a\x5c\x1d\xb8\x3b\x48\xdf\xe5\x7a\x0c\x76\x28\x97\x29\x9b\x3b\x89\x70\x48\x2f\xd2\x89\xee\x72\x52\xa9\x6e\xab\xdc\x59\x66\x68\xb5\xd8\xf1\xae\xa7\xe8\x0b\x76\xba\xc3\x93\x39\x0d\xc1\x60\x7f\x84\xba\x1e\xde\x68\x32\x19\xf6\x05\xdb\xb4\xfc\x84\x3f\x20\xc3\x4d\x38\x2e\x0f\xac\x8d\x98\xba\x55\x73\xd2\x8c\x80\x17\xa9\xc2\xf1\xc8\xee\x16\xb6\x7d\x66\x62\x37\x74\x0b\x15\x63\x90\xd0\xc8\x2f\x45\xaa\xb4\x1a\xc0\x42\x78\x0f\xd0\x2b\x7e\x3d\x20\x84\xce\xca\x74\xd3\x1c\xd2\x6d\x55\x7f\xee\x14\xbf\xce\x1e\x62\x7a\x72\x7a\x8e\x0c\x02\x16\x4b\x0d\x8b\x55\x55\x3d\x94\x3f\x27\x96\x12\x43\x3c\x92\xd3\x38\x85\x52\x4e\xc5\x31\x33\x50\xff\xc9\x19\xb2\xd3\x53\x64\xcf\xc2\x7a\x3d\x57\xab\xc0\xa3\xcb\xec\x57\x1d\x3b\x37\x25\x0b\xd8\x60\x87\x2f\x95\x0b\x11\x7e\x9a\xa6\x53\xdb\xa3\x67\x3f\x9c\x07\x43\x85\x42\xe9\x6a\x39\x08\x5d\x4c\x19\x8c\xf9\x29\x08\x8a\xd5\x43\x12\x96\x74\x3c\xd8\xdb\x59\xb5\x93\x58\x9b\x0f\x5a\x2a\x2e\x7b\xa7\x57\xa0\x78\x41\x9a\xf2\x68\x32\xa1\xc7\xe0\x2d\xe1\x52\xa6\x6f\x7c\xd4\x0a\x4f\x4c\x5c\x10\x84\xe0\xb0\x8f\x06\x3b\xa6\x2c\x6d\xc0\x8c\xdf\x5f\x20\x30\x23\x9f\xd0\x91\x22\xbc\xd9\xb1\x96\x66\x1b\x09\x85\x67\x6a\xc6\x77\xe5\x8c\xd9\xa0\xfc\x2d\x5c\x5e\x63\x6b\x43\xa4\x29\x69\x0b\x47\xa5\xe9\xd1\x98\x26\x7b\xc7\xea\x1d\x68\x6e\xe1\x74\x8c\xe0\x17\x42\xfd\x39\x2c\xc3\xe2\x15\x1b\x3a\x91\x27\xb9\x2b\xb8\xd4\xa4\x09\x42\x00\x14\x8e\xce\xeb\x19\xa7\xc2\x8d\xd8\x20\x2e\x11\x42\x0e\x40\x83\x84\x62\x7d\xb2\x34\x1f\x76\xc8\xd8\xf6\x2d\x2d\x3a\x1d\xbc\x23\x4b\xd4\x84\xa5\x45\xec\x0b\xdc\xab\x81\x43\xd6\x73\x2d\xd2\x20\xb5\x2d\xe6\xff\x48\x59\x8e\xb7\x5e\x96\x6c\xdd\xb2\x4e\x95\x59\xbb\x52\x61\xd9\x09\x8d\x01\x7b\xa0\x74\xe6\x89\x02\x98\x88\x87\x08\xb0\x10\xc4\x2c\xa1\x96\x9d\x45\x76\x5e\x58\x6c\xff\xc3\x6c\xbb\x51\x87\xce\xb6\xeb\x87\x3a\x22\x1b\x1e\xe3\xe8\xc4\x99\x10\x10\x15\xe0\xfc\xd5\xa5\x0f\x4e\x55\x5d\x7c\x77\xb8\x72\x37\x22\xd3\x33\x9a\x28\x0b\x47\xb0\x12\x01\x38\x2c\x0b\x78\x08\xba\x40\xe0\x8e\x08\xf8\xdd\xc4\x0c\x19\xf3\xd7\x53\x68\x30\x84\x15\x81\x65\x79\x80\x0f\x34\x91\xfe\x54\x23\xda\x31\x22\xc4\xed\xea\xe2\x50\xee\xc4\xe3\xe8\x45\xa2\x13\x55\x1b\x36\xd5\x7a\x43\xf3\xaa\x76\xec\x72\x04\xd7\x36\xbf\x96\xd7\xea\xf8\x17\x6d\xbc\x66\x5d\xb3\x0d\x87\x7b\x58\x60\x32\x8e\xdb\x3e\xed\xfa\xb6\xa9\xd7\xcf\xcf\x1b\x56\xb7\xd8\x12\xc2\x47\xc5\xcf\x4f\x9f\x68\x3e\xb1\x0c\x5e\x43\x8e\x77\x7c\x59\xf5\xaf\x86\xe5\xa3\x2e\x5d\x93\x6c\x80\x03\xe4\x69\x9e\x6e\xda\xf2\xe6\xd9\x83\x87\xdd\x83\xe7\xea\x67\x96\xa8\xa0\x43\xed\xd0\xf2\xf4\x49\xfe\x9c\xa5\xe7\xae\xd9\x92\x50\x1b\x57\x69\x76\x3b\x59\x5f\x62\x7f\x3b\x81\xc4\xf8\xe1\x9a\x2e\x6b\x60\xae\x6c\x15\x3f\xd4\xe0\xc2\xd1\xba\x5f\x1f\x5d\x36\x13\x93\x22\xfb\x82\x0a\x2a\x0c\x0c\x8f\x5b\xdd\x07\x4c\x93\x6d\x0b\xa9\xab\x86\x03\x76\x5a\x0d\x0b\xc9\xe6\x1a\x6f\xda\x30\xe3\x04\x24\x68\xb4\x61\xf5\xa9\x2a\x8d\x44\x24\x0d\xce\xb3\x3e\xe5\xe0\xa4\x94\x91\x56\x40\xbf\xcc\x53\xcd\x94\x09\x81\xd1\x1b\x41\x98\x60\x23\x1a\xfe\xc6\x18\x80\xcc\x3e\xd8\xfe\x90\x5f\x4e\x51\x81\xe4\x17\x68\xdd\x3a\x97\x37\xaa\x63\xa3\x80\x0e\xaa\x40\x9e\x7e\xdb\xa8\x4f\x22\xb5\x4c\x8c\x9a\x04\xe8\xbe\x8c\xc8\x9d\xbb\xa3\x7f\x68\x85\x68\x13\x6a\xfb\x7f\x4b\x0b\x52\xc1\xfd\x76\x32\x81\x54\x37\xd3\xa9\xdf\x0b\x63\x11\x55\xbd\x79\x47\xf7\x53\xb0\x8d\xb4\x55\x17\xa6\x21\xe6\x83\x12\x82\xe0\xb2\xaa\x0b\xd9\x36\x4a\xf5\x1a\xf7\xe0\xc8\x9d\x0e\xd3\x9a\x81\x60\xe3\xe3\x84\xfe\x0e\x90\x7f\x15\xb5\x1f\xd0\x06\x71\xab\xa1\x0e\xb8\x85\x6c\xc7\xac\x6f\xc4\xd6\xa5\x93\x7c\x47\xfa\x06\x62\x9e\x4e\xa5\xc1\x6b\x2e\xee\x34\xee\x4e\x9d\xa2\x56\xe5\xa5\x66\x62\xc1\x01\x98\xa0\xa8\x73\x88\xc0\x2f\xaf\x7a\x5a\x2b\xea\xaf\xd6\x68\x26\xac\x01\x6d\x3d\xe3\x0f\x1b\xf1\x5f\xa7\xa7\xef\x5e\x2f\x12\xd7\x9f\xb5\xf9\x6b\x4e\x32\x93\x8c\xe0\xe0\xb4\x5e\x26\xa5\x31\x7f\x71\xde\x12\xa9\x6e\x46\x36\xd4\x04\x39\xbb\x39\x4d\xe6\x23\x73\x89\xcb\x05\xc5\x65\x17\x58\x02\xa4\x37\x8c\x64\xcc\x99\xdd\x4c\xbf\x21\xc4\x3a\x7b\x14\x9f\x08\xfb\x3b\xe6\x75\x41\xa4\x4a\x2e\x08\x3a\x80\x5b\x8d\x42\x64\x08\x12\xda\x70\xca\xf2\x6d\xeb\xf6\x8a\x0d\x58\x77\x4b\x98\x1b\x50\x02\xc8\x70\x6f\xeb\x19\x8d\xd7\x1f\x74\xe1\xa0\x45\x49\x1f\xed\xcf\x54\xd8\xa8\xf8\x5f\x79\x5c\x22\x99\x29\x8e\x43\xd5\x8c\xda\x3c\x94\x5b\x8e\xa4\xd3\x01\x79\x27\xa4\x2a\x62\x91\x0b\x52\x81\x9c\xf3\x91\x23\x17\x9d\x24\x21\x6b\x1b\x5a\x47\xac\x31\x82\x20\x02\x86\xd7\x51\x34\x28\x63\xf7\x67\xa7\x6f\xdf\x5e\x5e\x7b\x2e\xcf\x94\x55\x17\x74\x16\x7d\xe3\xe2\x6f\x26\xe3\xb2\x28\x1c\x8c\x0f\x01\x59\x11\x84\x8f\x03\xd2\x1a\xc7\xe0\xc2\x8d\x6f\xad\x53\x72\xdd\x60\x37\x37\x3c\x16\xa9\x51\xc4\xe3\x2f\x8e\x29\x28\xc9\x47\x3e\x1e\x3f\x25\x66\x63\xbc\xe4\xff\x49\x68\xa6\x0d\x4c\xe3\xa0\x66\x6f\x41\xf7\xe1\xa6\x34\x80\xa6\x98\x98\x6d\xc1\xf6\x86\x1c\x12\x28\xe1\xbe\x01\x23\xbd\x49\xe1\x5d\x3b\x61\x2b\x54\xd3\x82\x06\x19\xb9\x43\x5d\xfd\x36\xe0\x7c\x67\xf9\x93\xe4\x15\x0e\xeb\x5a\x56\x5b\xe1\xb6\x7f\x76\x3f\x24\x9f\x53\xa3\x58\xcc\xa0\x73\xfa\xf5\xb4\xdb\x73\xa4\x1a\x71\xdb\xee\xd9\x83\xa1\x4a\xd9\xa8\xc1\x91\x21\x0f\x9e\x93\xb4\xc8\x5e\x6a\x5a\x3e\x82\x78\xce\x86\x89\xcf\x66\xef\x1a\x47\xc9\xa3\xcc\x02\x29\xb9\x0c\xd1\x94\xc8\x9d\x19\x85\xca\xd6\x62\xb0\xe8\xc5\xd2\x95\x06\xb3\x60\xee\xcc\xd4\xfd\xb9\x0c\x31\xa5\x1e\x09\x5d\xd7\x73\xfa\xd7\x56\x88\x06\x95\x7c\xbe\xb2\x90\x06\xd7\x15\x5c\xa6\xef\xf7\x8a\xd6\x7b\xc5\x0a\xd5\x62\x5d\xf5\x24\xd3\xf3\xd5\x0e\x68\xda\xb4\x61\x88\x29\xe2\xb6\x83\xa4\x2c\x67\xa6\xae\xc1\xa2\x62\x55\x57\x7d\xc6\xe7\xf4\x4e\x22\xd8\xa9\xd9\x7c\x2b\x32\x50\x8c\x68\x71\x18\xa7\xef\x7f\x3d\x3d\xbf\xf8\x75\xb1\x2b\x2c\xa0\x45\xf1\xa9\x91\x2c\x01\x46\x8b\xf2\x26\x1f\xb6\x66\x6a\xc3\x84\x91\x91\xfe\x82\x0c\xbd\xfc\x40\x5a\x11\xe1\xef\x56\x8e\x44\xb9\x0e\xf1\xda\x72\xbe\x65\x99\xf7\xbb\x23\x06\xa8\xb1\x17\xe7\x8f\xdb\xa1\xc6\x2d\xdc\x6f\x8e\x62\x17\x7f\xc6\xc6\xc5\x54\xc3\x40\x22\xe7\x67\xa2\x97\x33\x2c\x08\xdf\xdd\xce\x90\x28\xfc\xb0\xf4\x38\x2d\x9b\x6e\x94\xc7\x24\x4d\x3a\x70\xb9\x4d\xf1\xf7\xf1\x72\x3b\x94\x9a\x6c\xf3\xa2\x1a\x48\x38\x14\x3c\x1a\x8d\x5b\x4f\xba\x2c\x17\x7a\x67\x24\x58\x17\x85\x58\x20\x7a\x39\x33\x35\x80\xfd\xe6\x2c\x62\xab\xea\xe7\xa0\xcc\x11\x80\x70\x54\x0b\x89\x7b\x2d\x99\x12\xa3\x8a\x80\x38\xc8\xda\xb1\xcd\xd4\xdc\xf5\x79\x18\x6f\x9e\xc8\xa6\xb0\x9d\xa6\x5b\xe4\xc6\xed\x35\x44\x2e\x73\x58\x6a\xbc\xc9\x70\xbd\x25\xc0\x54\x18\x4c\xc2\xdc\xac\x60\x76\xbc\xbf\xcb\xd8\x72\x03\x0e\xbc\xbf\x4b\x10\x72\x41\xe7\x57\x86\xe3\x51\x32\xc1\x0f\xb7\xd5\x5e\x2e\x47\x51\x41\x55\x4a\xdc\x24\x12\x97\xff\x92\x08\x52\xdc\x0a\x61\xa1\x71\x63\x8a\x0b\x88\xef\xfe\x0c\xf6\xd4\xb3\x78\x2e\x96\xe4\x67\x0f\xb2\x25\xed\xd1\xcf\x0f\x02\x71\x9d\xef\x56\xb1\x8c\xfe\x0d\x09\x52\x07\xf5\x77\x7e\x90\x54\x62\xbf\xff\x82\x5f\x03\xc7\xe1\x89\x73\x95\x13\x89\xfe\x62\x83\x6c\xa2\x57\x7a\x98\x19\x25\x2c\x90\x2a\xdb\x20\x61\x34\xe4\x1c\xbf\x0d\x3c\x4b\xd1\x34\x9e\xa5\xff\xca\xbf\xd2\x97\xfc\x4b\xa7\xc2\xdb\xd8\xed\x51\xac\xf0\x68\x63\x87\x81\x69\xe0\x38\x1a\xdd\xe9\xf7\xb4\x44\xb3\x04\xd8\xd7\x30\x16\x03\xe4\x10\xe8\x64\x3f\xb0\xcb\x9e\xd7\xdd\x7a\x7b\x47\x39\x88\x27\xe7\x4c\x3e\xb2\x82\x16\x9c\xb5\x3e\x6a\x23\x71\xac\x42\x59\x44\xdf\x96\x10\xaf\xe8\x9f\x96\x65\x04\x9c\xf5\x39\xec\xb3\x02\x44\x24\xf7\x9f\xd3\x6b\xca\x51\x88\x32\x2c\x4a\x14\x14\xe5\xe3\x4b\x44\xd8\x46\x1d\x38\x2e\x27\x88\xe4\xb7\x65\xd7\x13\x8a\xa0\xeb\xba\x1f\x09\x8f\xb1\xea\x25\x72\x10\xa9\x44\xe3\x5a\xc5\x06\x2f\xc9\x04\x16\xce\x36\xe7\x28\xb1\xf7\xf9\x41\x7e\x12\xa6\xf5\xd6\xd1\x2b\x49\x49\x36\xe2\x9e\x05\x14\xd1\xd1\x0e\x1e\xc7\xb8\xd2\xf0\x3b\x4b\x27\x36\x80\xc5\x74\x20\x56\x32\xba\xf4\x94\xae\x46\xe5\x37\x22\xde\xbf\x60\xe1\xde\xf2\x72\xf0\xaf\xd4\xa2\x38\x5c\xfe\x8e\xb6\xbf\x18\xf3\x2e\x24\xe5\x4a\x0a\x09\x30\x3a\xe7\xfb\x75\x96\x67\x21\x9c\x97\xfc\xdf\xe5\x12\xc1\xe8\xfe\xa1\xff\x89\x62\x9e\x73\x55\x91\x93\x5b\x56\x3e\x3b\x13\x1e\x27\x85\x58\x8e\x49\x61\xb6\xdf\xe6\xab\xd2\x85\x8c\x02\x08\x7c\x9b\x6f\x78\x29\x30\x49\x7a\xec\x67\x5f\x52\xf9\x43\xda\xce\xf4\xcb\x4a\x68\x33\xd0\x59\xe8\x8a\xce\xf8\x67\x61\x85\x84\x7b\x0e\x42\xb4\x31\x44\xfd\x87\x65\x74\x7e\x30\x6f\x12\x0b\xde\x5b\x16\xa6\x39\xcd\xb1\xfa\x33\x35\x1c\x35\x85\xc4\x74\x0c\xe6\x68\xcb\xbb\x23\x35\xe9\x60\xe0\x50\x79\x88\x91\x9a\x1c\x41\xe8\x41\x84\xe3\x67\x5a\xb2\xe0\xe8\x5f\xb7\x21\x4e\xe1\x73\xc3\xa6\x98\x03\x95\x0e\x38\x5c\x8a\xe3\x00\x7d\x97\x85\xaa\x45\x73\x95\x84\xab\x14\xd9\xf2\x4e\xeb\x08\x33\x29\xd8\xa3\x77\xa4\xca\x8e\xdd\x76\xe0\xb2\x5a\xe5\xc2\x65\x84\x55\x78\x91\xd1\x30\x41\x48\x3a\x7d\xf8\xf1\xfb\x4f\x1d\xb7\xec\xac\x26\x4f\x1e\x7e\xfc\xe1\x13\xb1\x62\xfc\x63\x5e\x6c\xb5\xf7\x6d\x79\x5b\x35\x03\xae\x18\x6a\xd2\x93\x1a\x02\x8d\xdf\x72\x50\xb1\x66\xc9\xb2\x9b\xc0\xee\x69\x2e\x2e\x5f\x35\xdb\xc6\xd3\x24\x7e\x8d\x01\x44\x33\x78\xa8\xa4\xd2\xc5\xc5\x20\x5b\xb7\x18\x0f\xe1\xb1\xa9\x47\x0b\x22\x90\x65\x51\x71\x3b\xbf\xd2\xbf\xb8\x60\xe4\x9d\x8a\x0b\x5d\x60\x9a\x0c\x10\xe1\x69\x76\x3f\x66\xda\x8a\xfa\x78\x00\xea\x54\x93\x59\x30\x2f\xc9\xaa\x3d\x92\x0e\x16\xd9\x44\x90\x64\xd4\x3d\xcb\x1c\xab\xaa\xe5\x92\x10\xb7\xcd\x46\x3b\x94\x8a\xfb\x4a\x5b\x3e\xee\x56\x99\xef\xda\x6b\xa4\x32\x52\x1f\x18\xac\x2a\x51\x6c\x0f\xc2\xfd\x52\x70\xd0\x7d\xde\x96\x99\x18\xc9\x95\x93\x72\x8e\x5a\xfc\xbb\x79\x38\x9b\xa8\x01\xf7\x87\x26\x75\xa7\x0d\x1f\x5f\x30\x24\xe6\x29\x57\xb6\xe0\x56\x18\xb7\xb5\x3e\xdb\x47\xdc\x79\x12\xb0\x41\xcf\x17\x82\xe2\x19\x26\x16\x94\xce\x33\xb2\x31\x40\x21\xa7\x3d\x27\x1e\x76\x51\xdf\x24\x47\x0c\x65\xa6\x9c\x9c\x38\x0d\xfd\x4a\xf1\x6b\x3c\x04\xe6\xe9\x73\x7d\x5b\xcb\xa3\x19\xd1\x82\x2c\x37\x24\x8f\x49\x08\xa6\x08\x0e\xc1\x81\x4a\x2b\xaa\xc1\x05\xaa\x79\xeb\xaa\x46\xcd\x4b\x2d\x57\x7d\x16\x3b\xb6\x17\x11\xdd\x18\x16\xcc\x68\x55\x61\xa9\x9f\xf4\x39\xcd\x98\x8f\xb0\xf4\x5b\xbb\x9b\xf7\x5d\x3c\xc9\x52\xfc\x63\xfc\x3f\x2c\x70\x97\x4a\xb4\xa9\x4c\x48\x5a\x5b\x44\xe3\x9a\xe3\x2f\x5b\x9c\xb8\xd8\xc0\x47\x77\xd4\xdc\xe3\xdd\xee\x71\x51\x3c\x9a\x99\x75\x40\xcf\x6e\xda\x23\x33\xa7\x72\xd4\x11\x61\x07\x2d\x05\xcc\x61\x1e\x77\x0c\x10\xad\xd3\x07\x8e\xb0\x28\x59\xeb\x49\x0b\x8f\x37\x50\x6e\xb0\x76\x5d\x93\xee\xcb\x66\x4f\x68\x77\xe6\x24\xb6\x7d\x48\xcc\x59\x38\x93\x91\xaf\x33\x28\x1a\x85\xc6\xde\x3b\x3c\xc3\x83\xee\x48\xd6\xa5\x77\x47\x50\x22\xd7\x5a\x8f\x22\x24\x60\x67\x1e\xa9\x8e\xa5\xcd\x00\xce\x31\x34\xdf\xf7\xbf\x27\x53\x9b\xeb\x7c\x8e\x04\xbe\xc4\xd6\xe6\x6e\xd8\x5b\xde\x42\xe8\x1b\xa1\x0c\x92\xf2\x45\xc1\xcd\x18\xe0\xe7\x2c\xfc\xed\xc1\x36\x4d\xf3\x59\x6e\x07\x2d\x91\xf4\x25\xeb\xaa\xb7\x42\xbe\x7c\xfc\x2a\x2e\x5d\xe6\x5d\xb5\x0a\x9f\x06\xf8\x85\x33\x66\x86\x58\xf0\x1a\xb7\xd9\x3f\x44\x4e\x3a\xc7\xaf\xf4\x7f\x31\x61\x38\x10\x8d\x43\xb8\xb4\xdb\x60\x57\x1c\x8d\xe0\x4a\xd5\x0f\x1c\x74\xa5\x6e\xeb\x69\x5f\xea\x52\x65\x35\x64\xde\xdc\xe5\xe2\x09\x8e\x55\x31\xfa\x18\x5b\x0e\xd8\x52\xeb\xfc\xae\x93\xd0\x82\xb9\x90\x82\x38\xf2\xf1\x1e\x42\x71\x43\x71\x41\x55\xac\x0f\x69\xf2\xd2\xe2\xb2\xa6\x60\xce\x7a\xe8\x63\xb1\x62\x63\x03\xdb\xc6\x6b\x71\xb5\x22\x1e\x8b\xe3\xb6\x38\x2b\x0e\x02\x23\xba\x96\xab\xd4\xfe\x1a\x05\x62\xba\x61\x6a\xe6\x5b\x24\xd6\x2f\x5e\x99\x40\x44\x26\x07\xb7\x75\x62\xac\xd1\xc8\x32\x89\x32\x10\xab\x63\xee\x6e\x21\xb1\x2b\x63\x6c\x5f\x72\x0e\x24\x7f\x95\x48\xc2\x14\x6c\xa8\x28\x0b\xc8\x67\x14\x94\x03\xdc\x07\xb6\x8e\x11\xa0\x21\xe5\x92\xf8\x93\xb8\x42\xa4\x5a\x1e\x05\xb5\x49\xfc\x24\x0c\x40\x6a\x6c\x5d\xe6\xab\xcf\x6e\x44\xcc\xfe\xca\xb6\x47\x38\xd9\x14\xed\xec\xce\x5e\x41\xb2\x78\xba\x7f\xfe\x18\x36\x0c\xb9\x79\x8e\x59\xc8\x06\xaf\x6e\x02\x84\xc0\xa5\xc3\x2e\x9a\xdb\xaa\x18\x88\xbc\x79\x31\x16\x4f\x9f\xec\x9f\xc7\xf5\x89\x22\x60\xd7\x3a\xda\xc6\x68\xe1\x58\x2a\xa9\x70\x8d\x85\xe3\x35\x11\x38\x78\xe3\xe3\x61\x3b\xf4\x70\x74\x17\x05\xac\x28\x20\x75\x63\x27\x5f\x08\xa7\x98\xe2\xc4\xec\xcd\x78\x7f\x04\x36\x67\x07\xc3\x82\x53\x16\x90\x36\xfc\x1a\x46\xb3\x33\x4d\x89\xbf\x64\x64\xbd\xf3\xe1\x89\x6e\x68\x56\xa1\x3d\x3e\xbc\xd8\x7e\x9f\xce\xd8\xed\x1d\x28\x7b\x0e\x3d\xc7\x14\xa5\xb9\x28\x30\x9f\xb3\x20\xfb\x78\x85\x91\x1f\x33\x6a\x2b\xf6\x63\x06\x03\x94\xa3\xe6\x58\x3b\x67\xb3\x6d\xa8\xb7\x25\x68\x05\x51\xc8\x15\xe2\x4d\x33\xbd\x1a\x27\x11\x54\xe9\x38\xe0\x53\x4b\x0f\x9b\x26\xb8\x98\x21\xce\x55\x6c\xd6\x70\x20\x8b\x78\xae\x07\x39\x1f\x14\x2f\x7a\x5a\x8c\x8e\x11\xdb\x7c\x76\x96\x20\xc8\x7f\x37\x10\x6f\xd9\x56\xb4\xe8\x38\x32\xf4\x81\x87\xcb\xab\x6b\x5c\x9d\x27\x5e\x48\x8c\x66\xcd\xf4\x9a\xfe\x65\x43\xaa\x1e\x87\xe1\xf2\x3b\x0b\x1c\x1d\xb1\x4e\x9b\xd5\x8a\x63\x22\xaa\x5a\xaf\xa6\x1e\x4a\xf3\xde\xd5\xc5\x56\xe2\x23\xc2\xe8\x12\xe3\xbb\x62\xb8\x4b\xf1\x96\x02\x33\x81\x6e\x5f\xae\x48\x28\x59\xa4\x6f\x48\x44\xe3\x0b\xfa\xf2\x84\x03\x18\xe6\xbd\x76\x3e\x37\x13\x18\xdc\x58\xcb\x5c\x4c\x0f\x48\xf7\xd2\x8b\x9d\x92\x98\xf7\x9e\x63\x30\x45\x1b\xe6\x02\x12\x27\xca\xed\x8d\xc4\xd3\xb2\x03\x13\xa2\x9c\x3c\x0b\xc0\x4e\x14\xb9\x2d\xcd\xa6\x48\x34\xa0\x91\x21\xf0\x03\xe3\x12\x19\xcf\x6c\x5f\xb6\x2c\x8e\x58\x0c\x55\x18\x3e\x33\x1e\x13\xd4\x48\x1b\xd7\x6b\x61\x0b\x58\x3e\x08\xae\x72\xe3\xef\x84\x79\x31\xcb\x7c\xe6\x9b\x37\xe3\xf4\x5e\x6e\xf9\xf1\x49\x47\xf8\x42\x88\xba\x81\xc8\xf9\x81\xab\x3c\x1c\xab\x3d\xe8\x72\x58\x64\x1a\x10\xca\xfd\xcc\x8c\x48\x0f\x64\x46\x90\x78\x9e\x26\x10\x3e\x46\x00\x40\x16\x28\x30\x66\x61\x0a\xee\xe5\x80\x57\x11\x25\xea\x9e\x42\x8b\xe1\xe5\x67\x21\xdf\x7b\xb6\x51\x40\xe5\xd1\xdb\x3d\x98\xa1\x5e\xfa\x7b\xca\x37\xd6\x9e\x33\xf5\x3e\x7d\x82\xa4\xd3\x05\x95\xf2\xf8\xa9\x90\x80\xe2\xf8\x19\x88\x86\xf0\x87\xa3\xaf\x2d\xd7\x79\x5b\x58\xc4\xbf\x52\x3f\x3b\xb4\x41\xe5\x61\x40\x57\xbe\x25\x89\x5c\x9b\xa0\xdd\x4a\x20\x9f\xd9\xbc\x47\x84\xc2\x0f\xdd\x98\x12\xc2\x9c\xbf\x90\xad\xc5\xb1\x32\x44\xf0\xc3\x9e\xf7\x80\x6c\x28\xeb\x07\xd3\xfe\xf6\x4f\x57\x97\x6f\x4f\xd2\xdf\x1f\x1f\x0e\x87\xc7\x5c\xfd\xf1\xd0\x6e\x39\xaa\xa4\xe0\x1b\x05\xff\xf3\xe2\xcd\x49\x5a\xf6\xab\xef\x16\x24\xbd\x63\x6b\x78\xb1\x57\x9d\xed\x37\x1c\x04\xc0\x64\xc9\x9a\xdd\x3f\xbf\x65\xf6\x72\xf5\x4c\x9f\x65\x09\x2f\xa2\x85\x4c\x9b\x97\xdd\xac\x5b\x4a\x05\x62\xe5\xf2\x12\x63\x49\xba\x12\xae\x9e\x22\xe1\x0b\x80\x55\x5b\xbe\x0f\x8c\x0e\x11\x6e\x90\xdf\xb1\xb3\x72\xd8\x16\x42\xa7\xc6\xd1\x68\x76\x8a\xb2\xb2\xf8\x79\xdc\x12\x8c\xde\x78\x85\xe2\x59\xfa\x27\x56\xf4\x18\xa5\x42\x05\x5c\x64\x54\x00\xe0\x90\x96\xb0\xc3\x52\xbd\x46\x5b\x8e\x0b\xbc\xfb\xe1\xbc\xec\x11\x77\x37\x47\x1b\x32\x72\x37\x36\xbf\x9a\xb6\x51\xe9\x5c\xa3\xc6\x5a\xe1\xde\xe2\x43\x8f\xa8\x79\xb4\x07\xf8\x5c\x3a\x8c\xf7\xc1\xf8\x48\xd2\x4d\xe6\xd9\xbd\x6e\xb2\x09\xc7\x57\xc0\x2f\xed\x33\x95\x20\x26\x12\x5d\xd0\x83\x4a\x76\x93\x1e\x24\x22\x27\xd3\x59\x5a\x40\x3c\xa2\x74\xce\x5d\x5e\x7c\x04\x19\xd5\x80\x81\xc4\x24\xc3\x08\xe9\xb6\x24\xe6\x65\xe1\x0e\xe7\xc3\x2c\x0a\xc4\xba\x62\x10\x84\x5f\xb1\xdb\xd2\x5c\x7c\x93\xe0\xb3\x50\xcc\x90\x56\x2d\xb8\x42\x82\x40\x46\x85\xe3\xe7\x91\x46\xc5\xac\x59\xc8\xfb\x6b\x67\x92\x0a\xb1\xb5\xdf\x36\x77\x16\x9f\x77\x8e\x5f\x1a\xf8\x1e\xce\xcc\x83\xe9\xa4\x3c\x64\x20\xc1\x37\x59\xdc\xdc\x5f\x83\x2b\xd0\x2a\x06\xd4\x77\xa9\xc0\xb0\xf3\x3e\x14\xf5\x22\xab\xcc\xcc\xf0\x66\x42\xbc\x1c\xd4\x38\x18\xed\xdc\xf5\x70\x24\x18\x2d\xae\x1a\x06\xa4\x05\x55\xbf\x22\x20\x2d\x46\xd2\x34\xdc\xcc\x4f\xf5\x2b\x22\xce\xe6\x26\x1d\x18\x20\x94\x8c\xe7\x10\x3f\x53\x61\xce\x10\x51\x84\x73\xf3\x96\x88\xd0\xec\x20\xba\x01\x6d\x85\x9b\x66\xa2\xf0\x7d\x8d\x8e\x39\x37\x12\x8f\x92\x00\xb9\x5f\x32\x4b\x14\xd5\xcd\xcd\x62\xd9\x36\x87\x8e\x23\xde\xf0\xc8\x11\x3b\xe5\xf8\x77\x7a\x85\xdf\x02\xc2\xd6\x54\x10\x85\x24\x24\x53\x9c\x48\x94\x29\x09\xc9\xe4\xa3\x6d\xf2\xc8\xcc\x39\x95\xe0\x5d\x17\x7e\xf3\x89\x03\xd5\xa5\x64\x21\x55\x88\x9d\x1f\x32\x4e\x21\x52\x0f\x26\x12\x56\xc5\x51\xe9\x8a\x73\x14\x8c\x93\x86\x70\x8b\xfb\x61\xdb\xaa\x5d\x1d\x80\x1c\xe6\x43\x80\x40\x58\x06\x47\x60\x44\x0c\x15\x04\x2d\x0f\x12\x46\x10\x11\x84\xe1\xd2\x43\x28\x82\xb0\xe9\x7f\x79\xfd\x56\x7e\xc2\x2d\xa8\x17\x29\xe0\x17\x7c\xc1\x01\x1a\xe6\x6c\x5c\xcc\x39\x1d\xad\x4c\x9c\xb7\xa2\x9f\xda\xdb\x91\xf8\xe5\x20\x8a\x36\xbf\x81\xad\x92\xff\xbb\x5c\x12\xe6\x7c\xb5\x77\x6d\xf9\x78\x5c\x8d\x90\x23\xa8\xbe\x42\xc2\xe5\xab\xad\x91\xff\xb9\xbc\x9c\xed\x8a\x01\x0e\x1f\x16\x1e\x23\xe6\xba\x24\xba\x7b\x48\x07\x6d\xc5\x0a\xb8\x12\xe8\xa8\x43\x50\x87\x7f\x1b\x00\xb4\x83\x77\x18\x0d\xa2\xcf\xd7\x2e\xee\x2e\x5f\x8b\x3b\xc6\x97\x41\xb4\xb7\xcb\x5c\x51\x1d\xff\x40\x80\x99\x14\xbc\x6b\x9a\xca\xf1\xd2\xd9\x2a\xf4\x78\x53\x26\xbb\xba\x71\x1f\xa7\xdb\x2c\xc6\x0b\xe1\xdc\x42\x8a\xb3\x14\xbf\x1d\x94\x49\x2a\x4c\x2e\xd9\xae\x08\x84\x15\x21\xa0\xf0\x58\xb9\xc8\xdb\xcf\xfc\xf4\x11\x1c\x55\xd6\xc0\xa1\xd5\x0b\x38\xfc\x3f\x5c\x31\x7d\x72\xeb\x9d\xa4\x26\x1d\xc6\x7e\x52\xd4\x86\xce\x64\xcc\xd4\x55\x60\xe9\x4a\x2e\x7b\xbd\x91\x94\xbc\x95\x39\xa6\x8c\x69\x00\x2a\x95\x3d\x1e\xaf\x5b\x00\xef\x10\xfd\x97\xf2\xff\xfe\xef\xff\x43\xec\x69\xdf\xd0\x69\x89\xd0\x68\xbd\x95\xeb\xd7\xdd\xe2\x6c\xfc\x03\x69\x8f\xc1\xa3\x83\x81\x08\xfa\x53\x8d\x36\xa6\xd4\x84\x46\xf9\xf5\x24\xa3\xef\x2b\xb6\x51\xc5\x44\x0e\x6d\xc7\x93\x39\xec\xe3\xe3\x36\x8c\xa8\x32\x3d\x23\xdc\xad\x40\x5b\x5c\x2c\x9a\xdc\xb5\x51\xa2\x9b\x3f\x52\x92\x8f\xa4\x53\x7f\xf2\x77\xc7\xdd\x42\x44\xf7\xc6\xa1\xe2\x78\x18\x43\xd8\x4b\x26\xbf\xe9\x53\x91\xa2\x32\xca\x43\x15\xf0\x36\x59\x34\x9d\xdc\xe5\x94\x48\x7f\xd7\x48\xd8\xd1\xa3\xce\xc2\xfd\xf5\x0d\x13\x04\xd4\xcf\xdc\xb9\x08\xef\x11\x90\xc6\xa8\x4e\x09\xb9\xa3\xaa\xee\x98\xe8\xe5\x58\x44\x8a\x98\xfd\xc7\xc4\xc0\x22\x51\x3f\x01\x47\x2f\x70\x82\xaf\x11\xf3\x7b\x9c\x4c\x7e\x62\xe1\x7d\x8d\x0c\xda\xd7\xc8\xc0\x15\x79\xc4\x67\xf0\xff\x04\x17\x13\xd5\x48\xc1\xb9\x9a\xd2\xfc\xd1\xe5\xc7\x36\x7a\xe8\xc9\xc7\xb0\xe0\x52\x74\xf4\xb2\x12\x37\x0e\x44\xcd\xb8\x88\x26\x57\xe5\xb1\x32\xc8\xbd\x0f\x3a\x8a\x04\x7c\xb4\x85\xd5\x4e\x6f\xd6\x70\x5b\xc4\xe5\xd4\x99\xad\x24\x83\x8b\xda\xfc\xa2\x49\xcd\x6f\x94\x19\x96\x5d\x37\xc1\x96\xd9\x88\xff\xc8\x57\xe3\xf5\xca\x97\xb4\x79\x7e\x16\x78\x8e\x11\xa9\xba\x2e\x10\x12\x50\xc7\x67\xa7\x5b\x52\x10\xb6\x91\x32\x83\x86\x58\x94\xfb\xf9\x48\x30\xdd\xf4\x51\x83\x3f\x1e\x4e\x37\x6d\xe3\xfe\x80\xba\x7f\xd6\x75\x31\x7f\x61\xd1\x15\x4f\x6f\x2e\xba\xa2\xb9\x2b\x8c\xff\x06\x47\x02\x91\x94\x0e\x63\xb2\xb7\x8f\x7a\x12\xb4\x8e\x33\x44\x1f\x7f\x4c\xe2\x8f\xfb\x13\xa2\x2b\xfc\x5f\x21\xed\xc5\x33\x0e\x04\xbd\x68\x54\x0e\x21\x6c\xb0\x8a\x43\xbb\x8f\x69\x6f\x5e\x70\x8d\x78\xc6\x58\xc7\x9b\x44\x72\x63\xa6\xf7\x56\x89\xe3\xba\xc3\x61\x3a\xf3\x94\x8f\x84\x36\x2b\x8e\x44\x74\x8b\x39\xef\xcb\x61\xdd\x47\xec\xc3\xf7\xc5\x77\x8f\x47\xc9\xbc\xc6\x3d\xf7\x1a\x0e\xf2\xde\x1a\xe1\x31\x1b\xfb\x60\xfe\x2d\x31\xdf\xf3\x36\x58\xd6\x01\x0f\x66\x8a\xc1\xa1\x6c\xf8\xf3\x06\x05\xd6\x21\x0c\x5f\xa2\x64\x78\x86\xeb\x31\x37\xe0\x15\xd7\x7e\x3c\x68\x8e\x78\x10\xee\xbd\xd0\xfb\xcc\x76\x5b\x68\x94\xef\x59\x1f\x62\x28\xf6\x12\xb1\xed\x81\xe4\x37\xc4\x9d\xd9\x92\x71\xfd\xb8\x8f\x38\xd2\xdd\x72\x9d\x19\xfc\x02\x09\x97\x4f\x58\x5b\x95\x88\x44\x3e\x93\x94\x2b\x51\x5d\x4b\x9f\xe5\xf0\x83\x90\x27\x17\x9e\xc1\x12\xea\x73\xf5\xd4\x53\x5c\x73\x30\x27\x2d\xca\xdd\x9e\x97\x30\x77\x77\x90\x79\x99\x04\x50\xc5\x4d\x1d\x15\x24\xe4\x9f\xc6\x6d\xc9\xf3\x73\x7a\x7a\xbe\x6d\x0e\x89\x1c\x9d\x0b\x7e\x25\x20\x95\x27\x02\x34\x27\x1e\x92\xe4\xb1\x8c\xa2\x57\x73\x30\x07\x12\xd3\xe5\x26\xce\xb4\x7c\x14\x9d\x8c\x93\xc3\xc5\x25\xdb\x8b\x1f\x2c\x80\x42\x6a\x40\x40\x29\xcb\xf5\x21\x71\x2c\xb4\x55\x08\xb0\xbe\x5b\x91\x44\xa3\x7e\x43\x88\xaf\xe9\x98\xc7\x39\xe9\xee\xc4\xec\x5b\xb8\x00\xca\x41\xa7\xc2\x0f\x77\x36\x0e\x79\x21\xd3\x8d\xc3\x3d\xbf\xea\xc7\x11\x42\x7c\xcd\x38\xb8\x97\x27\x08\xf6\xe1\x45\xbc\x6f\x3c\xa4\x1c\xea\x7d\xd6\xd0\x7b\xd2\x8d\x87\xe8\xc3\x7b\xaf\x83\xf3\x1a\x1e\xc8\x62\x24\x7f\xb0\x79\x73\x7a\x70\x4a\x89\x38\xc2\x66\x44\x04\x71\x14\xcf\x5e\x6b\xfa\xf2\x16\xe7\x95\x46\x4d\x07\x1a\xb8\x80\x3d\xd8\xdc\x29\xa4\xe3\xf2\x22\x1d\x64\xac\x0b\x95\xeb\xa4\xf0\xcb\x07\xaf\xc0\xd9\x85\x24\x91\xef\xc2\x23\x03\x02\x9e\xad\x64\x21\xcf\x1f\xb9\x3d\xce\xac\x2e\xe8\x75\xda\x98\x63\xd5\x80\x72\x2c\x7a\x0a\x67\xbc\x33\x94\xce\x02\x63\x2b\x33\xe5\x13\x93\x59\xc5\xdb\x6a\x50\xbb\xfc\x2e\x72\x00\xf3\x45\x2c\xd6\xc8\xa2\x5d\x73\xfc\xc4\x9e\x0e\xc5\x9f\xd5\xf2\xa6\x90\x23\x98\xa3\x46\x99\x45\xb8\xd5\xa7\x04\xe2\xc9\x6e\xdd\xe6\x6c\x0b\xb7\xb5\x66\x66\x11\x90\x02\x1a\xfc\xc9\xcd\xd2\xbd\xcf\xec\xb9\x01\x3c\x6c\xd4\xd0\xa3\xfb\x98\xc2\x1f\x18\x00\xd8\xc6\xfd\x23\x00\x5b\x90\x97\x91\x68\x18\x01\x0b\xb8\x6f\x20\xfa\xb0\xf2\xd7\x0f\x04\x7c\xe3\x2b\x07\x72\x62\xa3\xd0\xf7\x38\x8a\x62\x76\xff\xdf\x37\xbe\x91\xba\x03\xe2\x8c\x1e\x7c\x19\x11\x7c\xf4\x91\x0b\x47\xf4\x41\x2c\x84\x35\x0b\x07\x98\xc6\x66\xe8\x71\xe6\x9b\xaa\x69\x09\xa1\xca\xd6\x7d\x18\xbf\x11\x5f\xbd\xe0\x88\x82\xbe\xbd\x53\x91\x84\x27\x17\xdf\xfc\xf0\xf7\xda\x45\x09\x83\x2f\x53\x1e\x01\xfa\x08\xb4\x7f\x3a\xf2\xb5\x1a\x79\xf4\x5b\xdc\xd3\x5d\xf4\xe5\x94\xe9\x7b\x2c\xf7\xbe\x85\x13\xbf\x01\x34\x7e\x0c\xaa\x93\xbb\x7b\x6b\x93\xe5\xec\x5d\xe5\xc4\x07\x6f\x5c\xdd\x11\x0e\x76\x78\x4a\x7e\xc5\xcf\x20\x34\x75\x25\x7e\xff\x0b\x49\xf1\x4b\x18\x6c\x8a\x51\x3b\x0c\x5f\x29\xf5\xc1\xc3\x7e\x76\x30\x2e\xb2\x8d\x49\x05\x01\x49\x07\xe5\xc1\xdb\x2c\x88\xb7\x6c\xed\xb5\x19\xdf\x02\x46\x02\x13\xe6\x10\x8c\x4c\xc7\x81\x46\x87\x6e\xae\xc7\x8c\x1d\x75\xa9\xba\x29\xdd\x27\x30\x98\x49\xf0\x03\x04\x05\x3f\x40\x20\xaf\xac\x9f\x04\x19\x11\xce\xc3\x82\xbd\xbb\xea\x1d\x65\xc7\x07\x9f\xcf\xc7\x35\x97\x38\x8b\xef\xb6\x44\x19\xf9\x6a\xd2\x8b\x19\xb0\xc3\x3c\x89\xa5\x0b\x73\xd8\x98\xc8\x0e\xbb\xa8\xf5\xf8\x06\x74\x58\x24\xcf\x1a\x45\x59\xfa\x92\x73\x3c\x13\xb1\xa9\x86\x79\xdb\x66\xcd\x4f\x32\xc1\x08\x19\x4f\x4f\x65\xe7\xb8\x4d\x0b\xe9\x8b\x9a\x40\xbc\x77\x98\x03\xbf\x56\x9f\x77\x71\x6d\x6c\xc1\x30\x43\x6f\xc4\x4e\x00\x49\xa7\xce\x57\x1b\xcc\x7f\x31\x47\x48\xa6\x1a\x3b\x62\xd2\x6f\xb8\xcc\x40\xca\x6b\xdb\xa9\xbd\xad\x3d\x0b\xc3\x1f\xf1\xc0\x53\xe6\x41\x29\x87\xc8\xd6\x99\x5e\x12\x6f\xf4\x4e\x1c\xc7\xcb\xba\x0b\xe1\xe9\x25\x76\x5c\x77\x6f\xa5\xe0\x14\xe3\x0b\x08\x7a\x09\x5d\x6b\x8a\xc4\x71\xcf\x71\xe6\x5b\xd6\x83\x51\x23\x17\x72\xaf\xab\x75\x5e\x4e\x60\xe9\xc6\x42\x1b\x1c\x91\x7c\x55\x1b\xa3\x51\x7a\x08\xd7\xcc\x1f\x1f\x2a\xac\x67\x7c\x51\x07\x16\xb9\x68\x90\x11\x5b\x33\x90\x2f\xb4\x30\x1a\xe2\x6c\x13\x7f\x60\x90\xfc\xfc\xff\x7a\xe5\x9e\x4b\x3f\xe7\x97\x36\xda\x25\x5f\x09\xe2\x33\xac\x94\xcf\x58\x34\x75\x6c\x81\x9b\xaf\x7e\xdf\xc8\x30\x20\xd6\xb9\xe7\x9a\x3f\x36\xb6\xb6\xec\xee\xea\x55\x86\xb7\xeb\xbb\x8d\x3a\x2a\xdf\x97\x62\x2b\x7f\xb4\xa0\xbc\x27\xb9\xde\xcb\x2c\xe1\xd2\xeb\x1e\xc9\x53\x44\xdf\xae\x28\x1f\x6f\xe7\xd3\x11\xf7\x18\x3c\x11\xb5\x4d\x80\x23\xf1\xac\xff\xee\xde\x8e\x46\x73\x09\x18\x62\x80\xdb\x16\x43\xe9\xcb\xaf\x9a\x41\xe0\x24\x0f\xa7\xc1\x64\xa0\xbb\x1f\xbc\x22\x7c\x73\x8f\x11\xf7\x2d\x5f\x45\xe5\xb7\x53\xf8\x49\x62\x0d\xf7\xd1\x03\xcd\xbe\x4d\xa0\xc6\xa3\x23\x13\x0a\xfb\xbd\x67\x85\x1e\x45\xa3\xf8\xf2\x1c\xc3\x43\x48\xbe\xba\x32\xec\xf1\xe9\x2b\xf7\xb9\x95\x0f\xf8\x1d\x32\x05\x79\x06\x29\x5b\x37\x6d\x43\xcb\x03\x13\xb1\x3d\x8d\xf4\xd2\xf2\xba\x99\x0a\x30\x81\xdf\x65\x83\xde\x54\xb3\x3a\x17\xc8\x26\xf9\x81\xaf\xad\xf9\x5a\x7d\xd3\xe7\x5b\xab\xc3\x16\xc8\x95\xda\xad\xaf\xb9\xc0\x6a\x9d\x5a\x41\x50\x53\xeb\x34\x4b\x8e\xf7\x44\x15\x05\xbe\xd4\x9c\x00\x16\x6e\x0e\xbe\x2b\x46\xe8\x1a\xf6\x19\x4f\x15\xd7\x8c\x24\x3b\x7d\x83\xec\xf4\x9a\xb3\xa7\x3d\xd8\xa8\x5c\xb5\xd1\xa0\x8e\xd5\xbb\x69\xcb\x49\x9d\x17\x7c\x6d\x72\x0c\x6f\x98\xdb\x94\xf9\x7e\x82\xb7\x57\x94\x39\xc1\x1a\x20\xa7\x08\x00\xec\x71\x2c\x84\xb5\xaa\x02\x8a\x55\x58\xe3\x35\x65\x1d\x83\x46\x04\xc0\x18\x1e\x1f\xa5\x3a\x52\x43\xcf\xec\xf1\xa8\xd4\x67\x33\x19\x55\xb3\xfc\x3b\x3e\xe1\xa4\xd0\x97\xf2\x33\x80\x5a\x36\x4d\xcf\x2f\xe5\xef\x59\xdc\x5a\x7d\x76\x68\xfa\xc5\xf2\x59\xdc\x5a\x7d\x9e\x60\x4a\xa0\xa7\xa8\x12\xe8\xe3\xb8\xda\xf1\x9d\x6d\xea\xab\x1d\x56\xfd\x40\x1b\xd4\x75\x78\x71\xc5\xf7\xbf\xaf\x5c\xc1\xa4\xc7\x49\xcd\x90\x42\xc7\x95\xe7\x7a\x5e\x91\x10\x51\xce\x76\x7d\xc6\x25\xf7\xf6\x3d\xa9\x1b\x76\x3e\xa9\x3e\xb7\x53\xf0\xf2\x1f\x1b\x9d\x97\xc3\xea\x73\xd9\x73\xcc\xf8\x26\x83\x87\x39\x6c\xeb\x9d\x81\xa5\xbf\x00\x2c\x7d\x45\x60\xe9\xb5\x7c\x87\x69\xda\x2a\x1d\x3a\xbb\xb2\xcf\x11\x29\x10\xb4\xf2\xf2\x8c\x56\x80\xb3\x8b\x7c\xae\x16\xac\x33\x99\x4a\xd9\xba\x0b\x59\xf0\x09\x5a\xd0\x2f\x44\x89\xe0\x7d\xea\x40\xe6\x5a\x63\x35\x40\x4e\xbf\xd5\xdd\x4a\x9e\xb5\x63\xc5\x80\xc6\xf0\x5e\x72\x02\x58\xbc\x3e\x44\xb0\xc6\x23\xe1\x14\xc7\x33\x44\x04\x7e\x1d\x33\x4a\xe1\x60\x1e\x58\x18\x17\xc1\xbd\xcb\x87\x6e\x16\x70\x9f\xcb\x66\x3a\x0a\x69\xdd\x1b\xa0\xf5\x3c\x86\xd3\x4e\x3b\x41\xa5\xb0\x15\xd1\xd4\x24\xb6\x58\x5f\xfe\xb1\x6f\x44\x22\xb4\xd8\xde\xfd\xc1\x97\x22\x05\xf6\x8b\x1f\x3e\x51\x30\x91\x5e\x21\xb3\x4a\x8e\xc9\x5b\x78\xd4\xd7\xd2\x56\x06\x4b\x94\xda\xf4\x34\x2f\xfa\x0a\x8b\xe6\xd9\xdd\x29\x77\x0d\x55\xf3\xc3\xfb\x94\xda\x22\x04\x53\x0b\x59\x89\x1f\xb8\xd7\xc8\x15\x01\x94\xb7\x0f\xc4\x93\xb4\x0d\x2b\x43\x69\x70\x9f\x08\x8c\x1a\x78\x03\x7d\x22\x98\xdb\xd1\x07\x32\xed\x6d\x98\xaf\x7c\x23\xd3\xcf\x26\xc0\x31\x1c\xdd\x31\x76\xab\x2e\x0b\xd1\x39\x7e\x5a\x26\x1f\xa1\x97\xc1\x15\xc3\x11\x28\x3c\xdf\xe1\x27\x5d\x02\xf7\xa3\xa1\x1c\x8e\x3e\x7c\x4a\x4a\x03\xf9\x26\x2d\x04\x75\x82\xef\x6f\x71\x38\xb4\xdc\x35\x9a\x43\x91\xb7\x0e\x1a\x86\xdc\x5b\xa3\x80\xbe\xd7\xb5\x14\xe3\x62\xfe\x09\xe4\xff\x2f\xaf\x40\x87\x03\xf0\x6f\x41\x1f\xe9\xff\xdf\xe5\x2d\xe8\xb1\x65\xd6\x3d\x06\x8d\xc7\x6e\x17\xb8\x1c\x10\xef\xe3\xc8\x71\x15\xed\x67\xd4\x08\xf7\x29\x32\x62\x57\x3e\xb2\xbc\xd9\xd7\x2c\xbe\x62\xb5\xc1\x16\x1d\xf7\x17\xdc\xe7\x88\x7a\x93\x1a\xd3\x27\x8b\xe2\x21\x48\xce\xd4\x5b\x24\xf9\x6a\x8d\x48\xf5\xd9\x8d\x52\xad\x47\x0b\x98\x24\xd4\x45\x63\x79\x93\x4f\xcd\xf2\xa6\xd6\xad\x3d\x1a\x72\xbc\xb9\xa3\x51\x4b\x25\xb9\xe9\x6b\x57\x45\x66\x99\x89\x02\x06\x53\x91\x9c\xf0\xfa\xbe\xe4\xc8\xe3\xa7\xf8\x1a\x80\xa4\x34\x7f\x1a\x85\x11\x8c\x58\x9b\x89\xbb\x0e\x1a\x05\xd0\x2c\xaf\x0a\xc6\x32\x8e\x4f\x95\xdc\xf0\xcb\xb2\x92\xa3\x1f\xe9\xc4\xf7\x39\x25\x67\x89\xf8\x21\x44\xb9\xb1\xf1\xe9\xfc\xad\x75\xdb\xf7\x6d\xb5\x1c\xfa\xf9\x67\x7d\x5d\xe9\x04\xda\xdc\xfe\x4c\xbb\xe9\x17\x60\xbb\xc1\x1a\xbe\x1a\xbe\xd4\xee\xe8\x93\x2b\x23\x38\x79\xa4\x20\x75\xaf\x6b\xbc\xc0\x6f\x2d\xdc\x31\x8f\xcc\x3a\xfe\x16\xf4\x05\xb1\x98\x22\xbd\x3a\xd5\x12\x7c\x8a\x53\xad\x23\xf8\x62\xe7\xd1\x55\x60\xc8\xc9\xa7\x3d\x7d\x91\xe2\x15\x45\x01\x72\xf5\x79\xe0\x5e\x5e\x6e\x95\xa7\x71\xaf\xdf\x5c\x51\x72\xd5\xde\x89\xc3\x48\xd7\x85\x3d\x06\xfa\x01\x4c\xfb\x5e\xc2\xe9\x85\xfb\xc4\x68\xb0\xd2\xda\x24\x7f\xbe\x30\x0b\xbe\xcc\xad\x8d\xd3\xf8\x1b\xfd\x38\x97\x1a\x4c\x95\x56\xf9\x71\x79\x0e\xfe\xdd\x77\xd6\x4e\x70\x15\x79\x44\xf6\xfa\x8c\xb0\xae\xc0\xe4\x30\x8a\x2d\xb7\x38\x68\xdc\xa1\x14\xd2\x7b\x78\x56\x46\x1d\x7c\xe5\xa3\xbf\x61\x5b\xc1\xa1\x72\xcf\x58\x67\xef\x1a\xc6\x8f\x40\x85\x80\x99\xec\x3f\x7b\xeb\x2d\x6a\xd8\x39\x99\xa6\x15\xa2\x47\xdf\xa2\x4a\xf3\x61\x00\xf7\x3d\xf7\x26\x46\x01\x53\xc6\x9d\xcd\x5b\x95\xf1\xd8\xf4\xad\xb0\xf7\x7d\xdd\x38\x00\xb9\x15\xd7\x5a\x00\x61\xdf\x65\x0f\x80\xe6\xbf\xae\xab\x00\x63\x9e\xa2\xd9\xa3\x8f\xae\x46\x5f\x5b\xb5\x9a\xf6\xf1\xb8\x66\x10\x6d\x1b\x1f\x77\xd4\x3b\x46\xef\x91\xc9\x82\x96\x81\xcf\x7d\xe1\x38\x28\xd2\x8e\xb8\x28\xec\x04\x27\x14\x7f\xee\xf1\xde\xaf\x31\x1b\x82\xd9\xe4\xbe\xca\xe4\x05\xa0\xa0\x0e\x0c\xfe\x2b\x84\xf1\x4e\x2b\xd1\xb8\xa7\x35\x68\xdc\x47\xc0\xc5\x09\x6c\xfc\xfc\x0a\xbf\x84\x85\xb8\x11\x73\x68\x99\x52\x91\x4d\x58\xf2\xc6\xdf\xc2\x08\x71\x50\x2c\x3d\x61\xb8\x2f\x64\xce\x92\x86\xff\xc2\x78\xd8\x2d\x7f\x1b\x3c\x38\x08\x7c\x6e\x78\xa4\xf9\xdc\xf0\x13\xe4\x3e\x77\xee\x9b\xe0\xd3\x52\xef\x99\xff\x96\x63\x53\x1e\xec\xe5\x33\xe9\xdd\x03\x7c\x08\xf6\xbb\xa0\x46\xf8\x3d\xf1\x38\x77\xdc\x86\x7e\xbe\x74\xd4\x84\x31\xcb\x68\xcb\x54\xab\x23\x88\x71\x5f\x31\x8c\x5e\x87\x06\xfa\xe5\x6b\xb8\x7a\xac\x44\x9f\x2f\x1e\x13\xb3\x67\xb6\x8e\x94\x43\x46\x6b\x03\xe3\x90\xf6\xe8\xbb\xbe\xfa\x2d\x39\x8d\x6d\x77\x5f\x4e\xfc\x05\xd9\x7e\x84\xb3\x1f\xed\x1d\x7f\xad\x97\x83\xce\xad\x4a\xfc\x79\xe5\xe9\x77\x95\x15\xcc\x9e\xa8\x87\x45\x60\xf2\x9a\x3d\x4c\x01\xfa\x98\xbd\x31\x06\xb9\xe2\xc4\xf1\xdd\xd9\x56\xcd\xdf\x72\x0d\x0a\x51\xde\xe9\x1b\xd8\xbb\xdd\xb8\xa3\x4f\xbc\x45\x95\xe4\xcb\x72\xee\x33\x52\xd3\xca\x76\x5b\xcf\x2d\xa2\xdd\x3e\x9a\x5d\xc4\xdf\x86\x72\xa0\xc6\xe5\xdb\x6f\xfc\x90\x1a\xfd\x4c\xdf\xe0\xa7\x5b\x2b\xb9\x56\x04\x6d\x98\x83\x99\x9f\xd9\x45\x23\x28\xc5\x94\xe3\x56\xe9\x73\xb5\xe7\x63\x59\xbf\x7d\xc3\x8b\x43\x39\x38\x9b\xff\x8c\x9c\x10\xc9\x21\x67\xbe\xc0\xef\xf9\x01\x2a\xec\x54\x0a\x8c\xcb\x8d\xa0\x88\xce\x9b\x80\x98\x5e\xfd\xfa\xe6\x72\x04\x39\xb3\x41\xb5\x64\x66\x43\xc7\xdf\xf6\x0e\xb7\xaf\xb8\x72\xdc\x14\xe0\xbe\x99\x9f\x81\x40\x1e\x9d\x80\xd0\x90\xf7\xcc\x82\x78\x66\x1b\x52\x6a\x2b\xf2\xbd\xec\x18\xa5\x33\xf9\x1d\x03\x05\xaf\x4b\x0a\x94\x3d\x2e\x39\xe9\xb5\x0e\xfb\xac\xc5\x0d\xe1\xf9\x81\x84\x08\x04\xfc\x40\x42\x6d\x67\x87\x67\xd0\xa4\xb2\xde\x56\x85\x0a\x8e\x02\xff\x4e\xb3\x0c\xd4\x40\x7c\xcb\x06\xa1\x4d\xbb\x61\x12\xe1\x56\x4e\x7a\x3b\xc3\xaf\x68\xe9\x74\x23\xf2\x7e\x11\x58\xbf\x0d\xf9\x6d\x7c\xa9\x61\xc0\xeb\x95\x43\x8c\x19\x94\x5e\x9e\xf9\x77\x37\x61\x7b\x1a\x4d\x66\x5b\xdd\x94\xce\x52\xa5\xb3\x79\x43\x79\x11\x30\x7f\x94\xbf\xb3\x0b\x91\xf2\x7d\x41\xfe\xac\xf7\x68\x12\x61\x53\x3a\x93\x49\x4b\xfb\x0a\xd6\xc3\x00\x2f\x92\x31\x8f\x71\x83\x56\xbe\x1d\x80\x2b\xe3\x1e\xb3\x5b\xfb\x3e\x4f\xb0\x43\xfc\xc7\x32\xfc\xf9\xec\x7a\xe7\x73\x79\xb6\x67\x86\xd2\x93\x8b\x61\x70\x72\x59\xb4\xc0\x62\xd5\xca\xdb\x2a\xfc\xef\x9a\xfd\xb8\xae\x24\xdc\x7b\x96\xd7\x11\xed\x15\x83\x5c\xb6\xd1\xa4\x87\xf7\xd1\x05\x82\x26\x2b\x98\x79\xce\x2c\x06\x28\x7f\x2f\x57\x43\xe0\x56\xf8\x55\x7e\xab\x1d\xcf\x37\xd3\x58\x70\xe0\x50\xe3\xc1\xb5\x77\x92\x13\xc0\xcc\x3d\xb0\x64\x43\x47\x88\xa3\x85\x3a\x1e\xed\xdf\x75\x0f\xf5\x87\xa1\x2c\xe2\xc2\xa2\x1c\xe4\x67\xb6\x95\xbb\x17\xa3\x20\x0c\x83\x0d\xa5\x90\x30\x2f\xfb\x3e\x92\xd3\x5c\xd9\xcc\xc0\xad\xa8\xc1\x97\xe7\xf7\x8b\x00\x16\xa2\x78\xf0\xf2\xb9\x8c\x41\xca\xbf\x14\x62\x95\x7c\x94\x98\x86\x4f\xa3\xc7\x71\xcd\xfc\x18\x84\xd1\x44\xf7\x7f\x1e\xca\x13\x75\x72\x49\xca\x2a\x71\x04\x91\x3c\xb1\x17\xc0\x3e\xe9\xda\xd5\x93\x87\xe1\xc3\x76\x6c\x11\xf2\x00\xfc\x10\x1e\x17\xfe\xa8\xaf\xde\xe9\x38\x60\xd4\xa0\x36\xff\xa6\x0f\xe6\xc9\xef\xb0\x5d\x31\x7b\x48\xd3\xdd\x7f\x72\xad\xff\x2d\xd1\x60\x0b\xdf\x84\x66\xe0\xa1\xfc\x3f\xd2\x90\x7b\xc3\x43\xe7\x67\xbf\x47\x78\xc1\x95\x69\x46\x88\xdc\x9d\x1e\x7f\x3d\x41\x51\x85\x9b\xd7\x7c\x13\xc7\xe3\x89\x7e\xdc\x8f\xa8\xa8\xa9\x09\xa2\xf4\xc5\xb7\x1f\x32\xff\xca\x26\x2e\xe1\x49\x41\xd5\xe9\xbb\x58\xf2\x69\x8a\x1f\xdc\x0b\x9b\xc9\xc7\xbe\x69\xb6\x9f\x92\x7c\xcd\x73\xa2\xbf\x09\x9e\xb0\x95\x78\x5d\xc4\xa4\x51\x32\x91\x9f\x9c\xfa\x9e\x1b\xfe\x9e\xb4\x54\x62\x20\x78\x9c\xed\xfb\x1d\x32\xe4\xe3\xc6\xc8\xd8\x20\x83\xdf\x3e\xc6\xcf\x02\x3f\x8b\xfc\x0e\xbf\x0e\xf8\x75\x28\xcb\xcf\x52\x19\x1c\x86\xaa\x93\xd6\xb7\x41\xce\x1d\x7e\xf3\x6b\x63\xf8\xb2\x3c\xfa\xd1\x67\x05\xed\x07\x9e\x84\x93\x6f\x29\x23\xdf\x7e\x50\xbe\x7c\x65\xe4\x99\xff\xe0\xc8\x43\xf6\x8f\xdd\x69\x16\x52\x94\xc3\xdd\x6b\x96\x24\x1f\x82\x4d\x90\x2e\xab\x0d\x4a\x9a\x72\x79\x1c\x9a\x29\x49\xca\x6b\xf3\x43\xe6\xc7\xa5\x29\xe4\xfa\x51\x69\x2a\xf9\x7f\x01\x00\x00\xff\xff\x7f\xe3\x59\x24\x11\x8d\x00\x00") func confLocaleLocale_enUsIniBytes() ([]byte, error) { return bindataRead( @@ -787,7 +787,7 @@ func confLocaleLocale_enUsIni() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/locale/locale_en-US.ini", size: 35985, mode: os.FileMode(420), modTime: time.Unix(1439021705, 0)} + info := bindataFileInfo{name: "conf/locale/locale_en-US.ini", size: 36113, mode: os.FileMode(420), modTime: time.Unix(1439038800, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/modules/mailer/mail.go b/modules/mailer/mail.go index 9ed338ab2..195f3d3ed 100644 --- a/modules/mailer/mail.go +++ b/modules/mailer/mail.go @@ -156,7 +156,7 @@ func SendResetPasswdMail(r macaron.Render, u *models.User) { // SendIssueNotifyMail sends mail notification of all watchers of repository. func SendIssueNotifyMail(u, owner *models.User, repo *models.Repository, issue *models.Issue) ([]string, error) { - ws, err := models.GetWatchers(repo.Id) + ws, err := models.GetWatchers(repo.ID) if err != nil { return nil, errors.New("mail.NotifyWatchers(GetWatchers): " + err.Error()) } @@ -167,7 +167,7 @@ func SendIssueNotifyMail(u, owner *models.User, repo *models.Repository, issue * if u.Id == uid { continue } - u, err := models.GetUserById(uid) + u, err := models.GetUserByID(uid) if err != nil { return nil, errors.New("mail.NotifyWatchers(GetUserById): " + err.Error()) } diff --git a/modules/middleware/repo.go b/modules/middleware/repo.go index 121646324..c4c53c03a 100644 --- a/modules/middleware/repo.go +++ b/modules/middleware/repo.go @@ -257,7 +257,7 @@ func RepoAssignment(redirect bool, args ...bool) macaron.Handler { ctx.Data["HasAccess"] = true if repo.IsMirror { - ctx.Repo.Mirror, err = models.GetMirror(repo.Id) + ctx.Repo.Mirror, err = models.GetMirror(repo.ID) if err != nil { ctx.Handle(500, "GetMirror", err) return @@ -291,10 +291,34 @@ func RepoAssignment(redirect bool, args ...bool) macaron.Handler { ctx.Data["Tags"] = tags ctx.Repo.Repository.NumTags = len(tags) - // Non-fork repository will not return error in this method. - if err = repo.GetForkRepo(); err != nil { - ctx.Handle(500, "GetForkRepo", err) - return + if repo.IsFork { + // Non-fork repository will not return error in this method. + if err = repo.GetBaseRepo(); err != nil { + ctx.Handle(500, "GetBaseRepo", err) + return + } else if repo.BaseRepo.GetOwner(); err != nil { + ctx.Handle(500, "BaseRepo.GetOwner", err) + return + } + + bsaeRepo := repo.BaseRepo + baseGitRepo, err := git.OpenRepository(models.RepoPath(bsaeRepo.Owner.Name, bsaeRepo.Name)) + if err != nil { + ctx.Handle(500, "OpenRepository", err) + return + } + if len(bsaeRepo.DefaultBranch) > 0 && baseGitRepo.IsBranchExist(bsaeRepo.DefaultBranch) { + ctx.Data["BaseDefaultBranch"] = bsaeRepo.DefaultBranch + } else { + baseBranches, err := baseGitRepo.GetBranches() + if err != nil { + ctx.Handle(500, "GetBranches", err) + return + } + if len(baseBranches) > 0 { + ctx.Data["BaseDefaultBranch"] = baseBranches[0] + } + } } ctx.Data["Title"] = u.Name + "/" + repo.Name @@ -327,8 +351,8 @@ func RepoAssignment(redirect bool, args ...bool) macaron.Handler { } if ctx.IsSigned { - ctx.Data["IsWatchingRepo"] = models.IsWatching(ctx.User.Id, repo.Id) - ctx.Data["IsStaringRepo"] = models.IsStaring(ctx.User.Id, repo.Id) + ctx.Data["IsWatchingRepo"] = models.IsWatching(ctx.User.Id, repo.ID) + ctx.Data["IsStaringRepo"] = models.IsStaring(ctx.User.Id, repo.ID) } ctx.Data["TagName"] = ctx.Repo.TagName @@ -342,8 +366,8 @@ func RepoAssignment(redirect bool, args ...bool) macaron.Handler { // If not branch selected, try default one. // If default branch doesn't exists, fall back to some other branch. - if ctx.Repo.BranchName == "" { - if ctx.Repo.Repository.DefaultBranch != "" && gitRepo.IsBranchExist(ctx.Repo.Repository.DefaultBranch) { + if len(ctx.Repo.BranchName) == 0 { + if len(ctx.Repo.Repository.DefaultBranch) > 0 && gitRepo.IsBranchExist(ctx.Repo.Repository.DefaultBranch) { ctx.Repo.BranchName = ctx.Repo.Repository.DefaultBranch } else if len(brs) > 0 { ctx.Repo.BranchName = brs[0] diff --git a/public/css/gogs.min.css b/public/css/gogs.min.css index e7658d42d..6965c25a2 100644 --- a/public/css/gogs.min.css +++ b/public/css/gogs.min.css @@ -1 +1 @@ -@font-face{font-family:octicons;src:url(../fonts/octicons.eot?#iefix&v=345f8bad9c5003db196d08f05e7f030fd2a32ff6)format('embedded-opentype'),url(../fonts/octicons.woff?v=345f8bad9c5003db196d08f05e7f030fd2a32ff6)format('woff'),url(../fonts/octicons.ttf?v=345f8bad9c5003db196d08f05e7f030fd2a32ff6)format('truetype'),url(../fonts/octicons.svg?v=345f8bad9c5003db196d08f05e7f030fd2a32ff6#octicons)format('svg');font-weight:400;font-style:normal}.mega-octicon,.octicon{font:normal normal normal 16px/1 octicons;display:inline-block;text-decoration:none;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.mega-octicon{font-size:32px}.octicon-alert:before{content:'\f02d'}.octicon-alignment-align:before{content:'\f08a'}.octicon-alignment-aligned-to:before{content:'\f08e'}.octicon-alignment-unalign:before{content:'\f08b'}.octicon-arrow-down:before{content:'\f03f'}.octicon-arrow-left:before{content:'\f040'}.octicon-arrow-right:before{content:'\f03e'}.octicon-arrow-small-down:before{content:'\f0a0'}.octicon-arrow-small-left:before{content:'\f0a1'}.octicon-arrow-small-right:before{content:'\f071'}.octicon-arrow-small-up:before{content:'\f09f'}.octicon-arrow-up:before{content:'\f03d'}.octicon-beer:before{content:'\f069'}.octicon-book:before{content:'\f007'}.octicon-bookmark:before{content:'\f07b'}.octicon-briefcase:before{content:'\f0d3'}.octicon-broadcast:before{content:'\f048'}.octicon-browser:before{content:'\f0c5'}.octicon-bug:before{content:'\f091'}.octicon-calendar:before{content:'\f068'}.octicon-check:before{content:'\f03a'}.octicon-checklist:before{content:'\f076'}.octicon-chevron-down:before{content:'\f0a3'}.octicon-chevron-left:before{content:'\f0a4'}.octicon-chevron-right:before{content:'\f078'}.octicon-chevron-up:before{content:'\f0a2'}.octicon-circle-slash:before{content:'\f084'}.octicon-circuit-board:before{content:'\f0d6'}.octicon-clippy:before{content:'\f035'}.octicon-clock:before{content:'\f046'}.octicon-cloud-download:before{content:'\f00b'}.octicon-cloud-upload:before{content:'\f00c'}.octicon-code:before{content:'\f05f'}.octicon-color-mode:before{content:'\f065'}.octicon-comment-add:before,.octicon-comment:before{content:'\f02b'}.octicon-comment-discussion:before{content:'\f04f'}.octicon-credit-card:before{content:'\f045'}.octicon-dash:before{content:'\f0ca'}.octicon-dashboard:before{content:'\f07d'}.octicon-database:before{content:'\f096'}.octicon-device-camera:before{content:'\f056'}.octicon-device-camera-video:before{content:'\f057'}.octicon-device-desktop:before{content:'\f27c'}.octicon-device-mobile:before{content:'\f038'}.octicon-diff:before{content:'\f04d'}.octicon-diff-added:before{content:'\f06b'}.octicon-diff-ignored:before{content:'\f099'}.octicon-diff-modified:before{content:'\f06d'}.octicon-diff-removed:before{content:'\f06c'}.octicon-diff-renamed:before{content:'\f06e'}.octicon-ellipsis:before{content:'\f09a'}.octicon-eye-unwatch:before,.octicon-eye-watch:before,.octicon-eye:before{content:'\f04e'}.octicon-file-binary:before{content:'\f094'}.octicon-file-code:before{content:'\f010'}.octicon-file-directory:before{content:'\f016'}.octicon-file-media:before{content:'\f012'}.octicon-file-pdf:before{content:'\f014'}.octicon-file-submodule:before{content:'\f017'}.octicon-file-symlink-directory:before{content:'\f0b1'}.octicon-file-symlink-file:before{content:'\f0b0'}.octicon-file-text:before{content:'\f011'}.octicon-file-zip:before{content:'\f013'}.octicon-flame:before{content:'\f0d2'}.octicon-fold:before{content:'\f0cc'}.octicon-gear:before{content:'\f02f'}.octicon-gift:before{content:'\f042'}.octicon-gist:before{content:'\f00e'}.octicon-gist-secret:before{content:'\f08c'}.octicon-git-branch-create:before,.octicon-git-branch-delete:before,.octicon-git-branch:before{content:'\f020'}.octicon-git-commit:before{content:'\f01f'}.octicon-git-compare:before{content:'\f0ac'}.octicon-git-merge:before{content:'\f023'}.octicon-git-pull-request-abandoned:before,.octicon-git-pull-request:before{content:'\f009'}.octicon-globe:before{content:'\f0b6'}.octicon-graph:before{content:'\f043'}.octicon-heart:before{content:'\2665'}.octicon-history:before{content:'\f07e'}.octicon-home:before{content:'\f08d'}.octicon-horizontal-rule:before{content:'\f070'}.octicon-hourglass:before{content:'\f09e'}.octicon-hubot:before{content:'\f09d'}.octicon-inbox:before{content:'\f0cf'}.octicon-info:before{content:'\f059'}.octicon-issue-closed:before{content:'\f028'}.octicon-issue-opened:before{content:'\f026'}.octicon-issue-reopened:before{content:'\f027'}.octicon-jersey:before{content:'\f019'}.octicon-jump-down:before{content:'\f072'}.octicon-jump-left:before{content:'\f0a5'}.octicon-jump-right:before{content:'\f0a6'}.octicon-jump-up:before{content:'\f073'}.octicon-key:before{content:'\f049'}.octicon-keyboard:before{content:'\f00d'}.octicon-law:before{content:'\f0d8'}.octicon-light-bulb:before{content:'\f000'}.octicon-link:before{content:'\f05c'}.octicon-link-external:before{content:'\f07f'}.octicon-list-ordered:before{content:'\f062'}.octicon-list-unordered:before{content:'\f061'}.octicon-location:before{content:'\f060'}.octicon-gist-private:before,.octicon-git-fork-private:before,.octicon-lock:before,.octicon-mirror-private:before{content:'\f06a'}.octicon-logo-github:before{content:'\f092'}.octicon-mail:before{content:'\f03b'}.octicon-mail-read:before{content:'\f03c'}.octicon-mail-reply:before{content:'\f051'}.octicon-mark-github:before{content:'\f00a'}.octicon-markdown:before{content:'\f0c9'}.octicon-megaphone:before{content:'\f077'}.octicon-mention:before{content:'\f0be'}.octicon-microscope:before{content:'\f089'}.octicon-milestone:before{content:'\f075'}.octicon-mirror-public:before,.octicon-mirror:before{content:'\f024'}.octicon-mortar-board:before{content:'\f0d7'}.octicon-move-down:before{content:'\f0a8'}.octicon-move-left:before{content:'\f074'}.octicon-move-right:before{content:'\f0a9'}.octicon-move-up:before{content:'\f0a7'}.octicon-mute:before{content:'\f080'}.octicon-no-newline:before{content:'\f09c'}.octicon-octoface:before{content:'\f008'}.octicon-organization:before{content:'\f037'}.octicon-package:before{content:'\f0c4'}.octicon-paintcan:before{content:'\f0d1'}.octicon-pencil:before{content:'\f058'}.octicon-person-add:before,.octicon-person-follow:before,.octicon-person:before{content:'\f018'}.octicon-pin:before{content:'\f041'}.octicon-playback-fast-forward:before{content:'\f0bd'}.octicon-playback-pause:before{content:'\f0bb'}.octicon-playback-play:before{content:'\f0bf'}.octicon-playback-rewind:before{content:'\f0bc'}.octicon-plug:before{content:'\f0d4'}.octicon-file-add:before,.octicon-file-directory-create:before,.octicon-gist-new:before,.octicon-plus:before,.octicon-repo-create:before{content:'\f05d'}.octicon-podium:before{content:'\f0af'}.octicon-primitive-dot:before{content:'\f052'}.octicon-primitive-square:before{content:'\f053'}.octicon-pulse:before{content:'\f085'}.octicon-puzzle:before{content:'\f0c0'}.octicon-question:before{content:'\f02c'}.octicon-quote:before{content:'\f063'}.octicon-radio-tower:before{content:'\f030'}.octicon-repo-delete:before,.octicon-repo:before{content:'\f001'}.octicon-repo-clone:before{content:'\f04c'}.octicon-repo-force-push:before{content:'\f04a'}.octicon-gist-fork:before,.octicon-repo-forked:before{content:'\f002'}.octicon-repo-pull:before{content:'\f006'}.octicon-repo-push:before{content:'\f005'}.octicon-rocket:before{content:'\f033'}.octicon-rss:before{content:'\f034'}.octicon-ruby:before{content:'\f047'}.octicon-screen-full:before{content:'\f066'}.octicon-screen-normal:before{content:'\f067'}.octicon-search-save:before,.octicon-search:before{content:'\f02e'}.octicon-server:before{content:'\f097'}.octicon-settings:before{content:'\f07c'}.octicon-log-in:before,.octicon-sign-in:before{content:'\f036'}.octicon-log-out:before,.octicon-sign-out:before{content:'\f032'}.octicon-split:before{content:'\f0c6'}.octicon-squirrel:before{content:'\f0b2'}.octicon-star-add:before,.octicon-star-delete:before,.octicon-star:before{content:'\f02a'}.octicon-steps:before{content:'\f0c7'}.octicon-stop:before{content:'\f08f'}.octicon-repo-sync:before,.octicon-sync:before{content:'\f087'}.octicon-tag-add:before,.octicon-tag-remove:before,.octicon-tag:before{content:'\f015'}.octicon-telescope:before{content:'\f088'}.octicon-terminal:before{content:'\f0c8'}.octicon-three-bars:before{content:'\f05e'}.octicon-thumbsdown:before{content:'\f0db'}.octicon-thumbsup:before{content:'\f0da'}.octicon-tools:before{content:'\f031'}.octicon-trashcan:before{content:'\f0d0'}.octicon-triangle-down:before{content:'\f05b'}.octicon-triangle-left:before{content:'\f044'}.octicon-triangle-right:before{content:'\f05a'}.octicon-triangle-up:before{content:'\f0aa'}.octicon-unfold:before{content:'\f039'}.octicon-unmute:before{content:'\f0ba'}.octicon-versions:before{content:'\f064'}.octicon-remove-close:before,.octicon-x:before{content:'\f081'}.octicon-zap:before{content:'\26A1'}body{font-family:'Helvetica Neue',Arial,Helvetica,sans-serif,'微软雅黑';background-color:#FAFAFA}img{border-radius:3px}.full.height{padding:0;margin:0 0 -87px 0;min-height:100%}.following.bar{z-index:900;left:0;width:100%;padding:.7em 0}.following.bar.light{background-color:#fff;border-bottom:1px solid #DDD;box-shadow:0 2px 3px rgba(0,0,0,.04)}.following.bar .ui.secondary.menu{height:30px}.following.bar .column .menu{margin-top:0}.following.bar .brand{float:left;margin-right:5px}.following.bar .head.link.item{padding-right:0!important}.following.bar .head.link.item .dropdown.icon,.following.bar .head.link.item .menu .octicon{margin-right:5px}.following.bar .user.avatar{padding:0;margin-top:1px}.following.bar .searchbox{background-color:#f4f4f4!important}.following.bar .searchbox:focus{background-color:#e9e9e9!important}.following.bar .octicon{width:16px;opacity:1!important;text-align:center}.ui.left{float:left}.ui.right{float:right}.ui .text.red{color:#d95c5c!important}footer{margin-top:40px!important;background-color:#fff;border-top:1px solid #d6d6d6;clear:both;width:100%;color:#888}footer .fa{width:16px;text-align:center;color:#428bca}footer .ui.language.dropdown{z-index:10000}footer .links>*{border-left:1px solid #d6d6d6;padding-left:8px;margin-left:5px}footer .links>:first-child{border-left:none}.hide{display:none}.center{text-align:center}.text-error{color:#d95c5c!important}.img-1{width:2px;height:2px}.img-2{width:4px;height:4px}.img-3{width:6px;height:6px}.img-4{width:8px;height:8px}.img-5{width:10px;height:10px}.img-6{width:12px;height:12px}.img-7{width:14px;height:14px}.img-8{width:16px;height:16px}.img-9{width:18px;height:18px}.img-10{width:20px;height:20px}.img-11{width:22px;height:22px}.img-12{width:24px;height:24px}.img-13{width:26px;height:26px}.img-14{width:28px;height:28px}.img-15{width:30px;height:30px}.img-16{width:32px;height:32px}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}.home{padding-bottom:120px}.home .logo{max-width:250px}.home .hero h1,.home .hero h2{font-family:'PT Sans Narrow',sans-serif}.home .hero h1{font-size:7em}.home .hero h2{font-size:4em}.home .hero .octicon{color:#d9453d;font-size:60px;margin-right:10px}.home .hero.header{font-size:24px}.home p.large{font-size:20px}.home .stackable{padding-top:30px}.home a{color:#d9453d}.install{padding-top:45px;padding-bottom:120px}.install form label{text-align:right;width:40%!important}.install form input{width:35%!important}.install form .field{text-align:left}.install form .field .help{margin-left:41%}.install form .field.optional .title{margin-left:38%}.install .ui .checkbox{margin-left:40%!important}.install .ui .checkbox label{width:auto!important}.form .help{color:#999;padding-top:.6em;padding-bottom:.6em;display:inline-block}.ui.attached.header{background:#f0f0f0}.ui.attached.header .right{margin-top:-5px}.repository.new.fork form{margin:auto;width:800px!important}.repository.new.fork form .ui.message{text-align:center}.repository.new.fork form .header{padding-left:270px!important}.repository.new.fork form .inline.field>label{text-align:right;width:250px!important;word-wrap:break-word}.repository.new.fork form .help{margin-left:260px!important}.repository.new.fork form .dropdown .dropdown.icon{margin-top:-7px!important}.repository.new.fork form .dropdown .text{margin-right:0!important}.repository.new.fork form .dropdown .text i{margin-right:0!important}.repository.new.fork form input,.repository.new.fork form textarea{width:50%!important}.repository{padding-top:15px;padding-bottom:120px}.repository .head{height:75px;padding-top:20px;background-color:#FCFCFC}.repository .head .mega-octicon{width:30px}.repository .head .fork-flag,.repository .head a{font-weight:300}.repository .head .ui.label{margin-top:5px;vertical-align:top}.repository .head .fork-flag{margin-left:38px;display:block;font-size:11px;line-height:10px;white-space:nowrap}.repository .head .button{margin-left:10px}.repository .head .button i{margin-right:5px}.repository .head .num{font-weight:700}.repository .head .octicon{height:5px}.repository .navbar{height:60px;padding-top:20px}.repository .navbar .ui.secondary.menu .item{margin-left:-10px;margin-top:-7px}.repository .navbar .ui.secondary.menu .item>.input .color-picker,.repository .navbar .ui.secondary.menu .item>.input .new-label-input{background-color:#fff;border:1px solid rgba(0,0,0,.15)}.repository .navbar .ui.secondary.menu .item.input{margin-right:-7px}.repository .navbar .ui.secondary.menu .item .new-label-input{width:150px}.repository .navbar .ui.secondary.menu .item .color-picker{height:35px;width:auto;padding-left:30px}.repository .navbar .ui.secondary.menu .item .minicolors-swatch.minicolors-sprite{top:10px;left:10px;width:15px;height:15px}.repository .navbar .ui.secondary.menu .item.precolors{padding-left:0;padding-right:0;margin-right:10px;width:120px}.repository .navbar .ui.secondary.menu .item.precolors .color{float:left;width:15px;height:15px}.repository .filter.menu .label.color{margin-left:17px;padding:0 8px}.repository .filter.menu .octicon{float:left;margin-left:-5px;margin-right:-7px}.repository .filter.menu .menu{max-height:300px;overflow-x:auto;right:0!important;left:auto!important}.repository .filter.menu .menu .clickable .name{padding-left:15px!important}.repository .page.buttons{padding-top:15px}.repository .issue.list{clear:both;list-style:none}.repository .issue.list>.item{padding-top:15px;padding-bottom:10px;border-bottom:1px dashed #AAA}.repository .issue.list>.item .title{color:#444;font-size:15px;font-weight:700;margin:0 6px}.repository .issue.list>.item .title:hover{color:#000}.repository .issue.list>.item .comment{padding-right:10px;color:#666}.repository .issue.list>.item .desc{padding-top:5px;color:#999}.repository .issue.list>.item .desc a.milestone{padding-left:5px;color:#999!important}.repository .issue.list>.item .desc a.milestone:hover{color:#000!important}.repository .label.list{clear:both;list-style:none}.repository .label.list .item{padding-top:10px;padding-bottom:10px;border-bottom:1px dashed #AAA}.repository .label.list .item a{font-size:15px;padding-top:5px;padding-right:10px;color:#666}.repository .label.list .item a:hover{color:#000}.repository .label.list .item a.open-issues{margin-right:30px}.repository .milestone.list{clear:both;list-style:none}.repository .milestone.list>.item{padding-top:10px;padding-bottom:10px;border-bottom:1px dashed #AAA}.repository .milestone.list>.item>a{padding-top:5px;padding-right:10px;color:#000}.repository .milestone.list>.item>a:hover{color:#4078c0}.repository .milestone.list>.item .ui.progress{width:40%;padding:0;border:0;margin:0}.repository .milestone.list>.item .ui.progress .bar{height:20px}.repository .milestone.list>.item .meta{color:#999;padding-top:5px}.repository .milestone.list>.item .meta .issue-stats .octicon{padding-left:5px}.repository .milestone.list>.item .meta .overdue{color:red}.repository .milestone.list>.item .operate{margin-top:-15px}.repository .milestone.list>.item .operate>a{font-size:15px;padding-top:5px;padding-right:10px;color:#666}.repository .milestone.list>.item .operate>a:hover{color:#000}.repository .milestone.list>.item .content{padding-top:10px}.repository.new.milestone textarea{height:200px}.repository.settings .content{padding-left:20px!important}.settings .key.list .item:not(:first-child){border-top:1px solid #eaeaea}.settings .key.list .ssh-key-state-indicator{float:left;color:gray;padding-left:10px;padding-top:10px}.settings .key.list .ssh-key-state-indicator.active{color:#6cc644}.settings .key.list .meta{padding-top:5px}.settings .key.list .print{color:#767676}.settings .key.list .activity{color:#666}.edit-label.modal .color-picker{margin-top:-8px!important;height:35px;width:auto!important;padding-left:30px!important}.edit-label.modal .minicolors-swatch.minicolors-sprite{top:1px;left:10px;width:15px;height:15px}.edit-label.modal .precolors{margin-bottom:-11px!important;padding-left:0!important;padding-right:0!important;margin-right:10px!important;width:120px!important}.edit-label.modal .precolors .color{float:left;margin:0!important;width:15px;height:15px} \ No newline at end of file +@font-face{font-family:octicons;src:url(../fonts/octicons.eot?#iefix&v=345f8bad9c5003db196d08f05e7f030fd2a32ff6)format('embedded-opentype'),url(../fonts/octicons.woff?v=345f8bad9c5003db196d08f05e7f030fd2a32ff6)format('woff'),url(../fonts/octicons.ttf?v=345f8bad9c5003db196d08f05e7f030fd2a32ff6)format('truetype'),url(../fonts/octicons.svg?v=345f8bad9c5003db196d08f05e7f030fd2a32ff6#octicons)format('svg');font-weight:400;font-style:normal}.mega-octicon,.octicon{font:normal normal normal 16px/1 octicons;display:inline-block;text-decoration:none;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.mega-octicon{font-size:32px}.octicon-alert:before{content:'\f02d'}.octicon-alignment-align:before{content:'\f08a'}.octicon-alignment-aligned-to:before{content:'\f08e'}.octicon-alignment-unalign:before{content:'\f08b'}.octicon-arrow-down:before{content:'\f03f'}.octicon-arrow-left:before{content:'\f040'}.octicon-arrow-right:before{content:'\f03e'}.octicon-arrow-small-down:before{content:'\f0a0'}.octicon-arrow-small-left:before{content:'\f0a1'}.octicon-arrow-small-right:before{content:'\f071'}.octicon-arrow-small-up:before{content:'\f09f'}.octicon-arrow-up:before{content:'\f03d'}.octicon-beer:before{content:'\f069'}.octicon-book:before{content:'\f007'}.octicon-bookmark:before{content:'\f07b'}.octicon-briefcase:before{content:'\f0d3'}.octicon-broadcast:before{content:'\f048'}.octicon-browser:before{content:'\f0c5'}.octicon-bug:before{content:'\f091'}.octicon-calendar:before{content:'\f068'}.octicon-check:before{content:'\f03a'}.octicon-checklist:before{content:'\f076'}.octicon-chevron-down:before{content:'\f0a3'}.octicon-chevron-left:before{content:'\f0a4'}.octicon-chevron-right:before{content:'\f078'}.octicon-chevron-up:before{content:'\f0a2'}.octicon-circle-slash:before{content:'\f084'}.octicon-circuit-board:before{content:'\f0d6'}.octicon-clippy:before{content:'\f035'}.octicon-clock:before{content:'\f046'}.octicon-cloud-download:before{content:'\f00b'}.octicon-cloud-upload:before{content:'\f00c'}.octicon-code:before{content:'\f05f'}.octicon-color-mode:before{content:'\f065'}.octicon-comment-add:before,.octicon-comment:before{content:'\f02b'}.octicon-comment-discussion:before{content:'\f04f'}.octicon-credit-card:before{content:'\f045'}.octicon-dash:before{content:'\f0ca'}.octicon-dashboard:before{content:'\f07d'}.octicon-database:before{content:'\f096'}.octicon-device-camera:before{content:'\f056'}.octicon-device-camera-video:before{content:'\f057'}.octicon-device-desktop:before{content:'\f27c'}.octicon-device-mobile:before{content:'\f038'}.octicon-diff:before{content:'\f04d'}.octicon-diff-added:before{content:'\f06b'}.octicon-diff-ignored:before{content:'\f099'}.octicon-diff-modified:before{content:'\f06d'}.octicon-diff-removed:before{content:'\f06c'}.octicon-diff-renamed:before{content:'\f06e'}.octicon-ellipsis:before{content:'\f09a'}.octicon-eye-unwatch:before,.octicon-eye-watch:before,.octicon-eye:before{content:'\f04e'}.octicon-file-binary:before{content:'\f094'}.octicon-file-code:before{content:'\f010'}.octicon-file-directory:before{content:'\f016'}.octicon-file-media:before{content:'\f012'}.octicon-file-pdf:before{content:'\f014'}.octicon-file-submodule:before{content:'\f017'}.octicon-file-symlink-directory:before{content:'\f0b1'}.octicon-file-symlink-file:before{content:'\f0b0'}.octicon-file-text:before{content:'\f011'}.octicon-file-zip:before{content:'\f013'}.octicon-flame:before{content:'\f0d2'}.octicon-fold:before{content:'\f0cc'}.octicon-gear:before{content:'\f02f'}.octicon-gift:before{content:'\f042'}.octicon-gist:before{content:'\f00e'}.octicon-gist-secret:before{content:'\f08c'}.octicon-git-branch-create:before,.octicon-git-branch-delete:before,.octicon-git-branch:before{content:'\f020'}.octicon-git-commit:before{content:'\f01f'}.octicon-git-compare:before{content:'\f0ac'}.octicon-git-merge:before{content:'\f023'}.octicon-git-pull-request-abandoned:before,.octicon-git-pull-request:before{content:'\f009'}.octicon-globe:before{content:'\f0b6'}.octicon-graph:before{content:'\f043'}.octicon-heart:before{content:'\2665'}.octicon-history:before{content:'\f07e'}.octicon-home:before{content:'\f08d'}.octicon-horizontal-rule:before{content:'\f070'}.octicon-hourglass:before{content:'\f09e'}.octicon-hubot:before{content:'\f09d'}.octicon-inbox:before{content:'\f0cf'}.octicon-info:before{content:'\f059'}.octicon-issue-closed:before{content:'\f028'}.octicon-issue-opened:before{content:'\f026'}.octicon-issue-reopened:before{content:'\f027'}.octicon-jersey:before{content:'\f019'}.octicon-jump-down:before{content:'\f072'}.octicon-jump-left:before{content:'\f0a5'}.octicon-jump-right:before{content:'\f0a6'}.octicon-jump-up:before{content:'\f073'}.octicon-key:before{content:'\f049'}.octicon-keyboard:before{content:'\f00d'}.octicon-law:before{content:'\f0d8'}.octicon-light-bulb:before{content:'\f000'}.octicon-link:before{content:'\f05c'}.octicon-link-external:before{content:'\f07f'}.octicon-list-ordered:before{content:'\f062'}.octicon-list-unordered:before{content:'\f061'}.octicon-location:before{content:'\f060'}.octicon-gist-private:before,.octicon-git-fork-private:before,.octicon-lock:before,.octicon-mirror-private:before{content:'\f06a'}.octicon-logo-github:before{content:'\f092'}.octicon-mail:before{content:'\f03b'}.octicon-mail-read:before{content:'\f03c'}.octicon-mail-reply:before{content:'\f051'}.octicon-mark-github:before{content:'\f00a'}.octicon-markdown:before{content:'\f0c9'}.octicon-megaphone:before{content:'\f077'}.octicon-mention:before{content:'\f0be'}.octicon-microscope:before{content:'\f089'}.octicon-milestone:before{content:'\f075'}.octicon-mirror-public:before,.octicon-mirror:before{content:'\f024'}.octicon-mortar-board:before{content:'\f0d7'}.octicon-move-down:before{content:'\f0a8'}.octicon-move-left:before{content:'\f074'}.octicon-move-right:before{content:'\f0a9'}.octicon-move-up:before{content:'\f0a7'}.octicon-mute:before{content:'\f080'}.octicon-no-newline:before{content:'\f09c'}.octicon-octoface:before{content:'\f008'}.octicon-organization:before{content:'\f037'}.octicon-package:before{content:'\f0c4'}.octicon-paintcan:before{content:'\f0d1'}.octicon-pencil:before{content:'\f058'}.octicon-person-add:before,.octicon-person-follow:before,.octicon-person:before{content:'\f018'}.octicon-pin:before{content:'\f041'}.octicon-playback-fast-forward:before{content:'\f0bd'}.octicon-playback-pause:before{content:'\f0bb'}.octicon-playback-play:before{content:'\f0bf'}.octicon-playback-rewind:before{content:'\f0bc'}.octicon-plug:before{content:'\f0d4'}.octicon-file-add:before,.octicon-file-directory-create:before,.octicon-gist-new:before,.octicon-plus:before,.octicon-repo-create:before{content:'\f05d'}.octicon-podium:before{content:'\f0af'}.octicon-primitive-dot:before{content:'\f052'}.octicon-primitive-square:before{content:'\f053'}.octicon-pulse:before{content:'\f085'}.octicon-puzzle:before{content:'\f0c0'}.octicon-question:before{content:'\f02c'}.octicon-quote:before{content:'\f063'}.octicon-radio-tower:before{content:'\f030'}.octicon-repo-delete:before,.octicon-repo:before{content:'\f001'}.octicon-repo-clone:before{content:'\f04c'}.octicon-repo-force-push:before{content:'\f04a'}.octicon-gist-fork:before,.octicon-repo-forked:before{content:'\f002'}.octicon-repo-pull:before{content:'\f006'}.octicon-repo-push:before{content:'\f005'}.octicon-rocket:before{content:'\f033'}.octicon-rss:before{content:'\f034'}.octicon-ruby:before{content:'\f047'}.octicon-screen-full:before{content:'\f066'}.octicon-screen-normal:before{content:'\f067'}.octicon-search-save:before,.octicon-search:before{content:'\f02e'}.octicon-server:before{content:'\f097'}.octicon-settings:before{content:'\f07c'}.octicon-log-in:before,.octicon-sign-in:before{content:'\f036'}.octicon-log-out:before,.octicon-sign-out:before{content:'\f032'}.octicon-split:before{content:'\f0c6'}.octicon-squirrel:before{content:'\f0b2'}.octicon-star-add:before,.octicon-star-delete:before,.octicon-star:before{content:'\f02a'}.octicon-steps:before{content:'\f0c7'}.octicon-stop:before{content:'\f08f'}.octicon-repo-sync:before,.octicon-sync:before{content:'\f087'}.octicon-tag-add:before,.octicon-tag-remove:before,.octicon-tag:before{content:'\f015'}.octicon-telescope:before{content:'\f088'}.octicon-terminal:before{content:'\f0c8'}.octicon-three-bars:before{content:'\f05e'}.octicon-thumbsdown:before{content:'\f0db'}.octicon-thumbsup:before{content:'\f0da'}.octicon-tools:before{content:'\f031'}.octicon-trashcan:before{content:'\f0d0'}.octicon-triangle-down:before{content:'\f05b'}.octicon-triangle-left:before{content:'\f044'}.octicon-triangle-right:before{content:'\f05a'}.octicon-triangle-up:before{content:'\f0aa'}.octicon-unfold:before{content:'\f039'}.octicon-unmute:before{content:'\f0ba'}.octicon-versions:before{content:'\f064'}.octicon-remove-close:before,.octicon-x:before{content:'\f081'}.octicon-zap:before{content:'\26A1'}body{font-family:'Helvetica Neue',Arial,Helvetica,sans-serif,'微软雅黑';background-color:#FAFAFA}img{border-radius:3px}.full.height{padding:0;margin:0 0 -87px 0;min-height:100%}.following.bar{z-index:900;left:0;width:100%;padding:.7em 0}.following.bar.light{background-color:#fff;border-bottom:1px solid #DDD;box-shadow:0 2px 3px rgba(0,0,0,.04)}.following.bar .ui.secondary.menu{height:30px}.following.bar .column .menu{margin-top:0}.following.bar .brand{float:left;margin-right:5px}.following.bar .head.link.item{padding-right:0!important}.following.bar .head.link.item .dropdown.icon,.following.bar .head.link.item .menu .octicon{margin-right:5px}.following.bar .user.avatar{padding:0;margin-top:1px}.following.bar .searchbox{background-color:#f4f4f4!important}.following.bar .searchbox:focus{background-color:#e9e9e9!important}.following.bar .octicon{width:16px;opacity:1!important;text-align:center}.ui.left{float:left}.ui.right{float:right}.ui .text.red{color:#d95c5c!important}footer{margin-top:40px!important;background-color:#fff;border-top:1px solid #d6d6d6;clear:both;width:100%;color:#888}footer .fa{width:16px;text-align:center;color:#428bca}footer .ui.language.dropdown{z-index:10000}footer .links>*{border-left:1px solid #d6d6d6;padding-left:8px;margin-left:5px}footer .links>:first-child{border-left:none}.hide{display:none}.center{text-align:center}.text-error{color:#d95c5c!important}.img-1{width:2px;height:2px}.img-2{width:4px;height:4px}.img-3{width:6px;height:6px}.img-4{width:8px;height:8px}.img-5{width:10px;height:10px}.img-6{width:12px;height:12px}.img-7{width:14px;height:14px}.img-8{width:16px;height:16px}.img-9{width:18px;height:18px}.img-10{width:20px;height:20px}.img-11{width:22px;height:22px}.img-12{width:24px;height:24px}.img-13{width:26px;height:26px}.img-14{width:28px;height:28px}.img-15{width:30px;height:30px}.img-16{width:32px;height:32px}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}.home{padding-bottom:120px}.home .logo{max-width:250px}.home .hero h1,.home .hero h2{font-family:'PT Sans Narrow',sans-serif}.home .hero h1{font-size:7em}.home .hero h2{font-size:4em}.home .hero .octicon{color:#d9453d;font-size:60px;margin-right:10px}.home .hero.header{font-size:24px}.home p.large{font-size:20px}.home .stackable{padding-top:30px}.home a{color:#d9453d}.install{padding-top:45px;padding-bottom:120px}.install form label{text-align:right;width:40%!important}.install form input{width:35%!important}.install form .field{text-align:left}.install form .field .help{margin-left:41%}.install form .field.optional .title{margin-left:38%}.install .ui .checkbox{margin-left:40%!important}.install .ui .checkbox label{width:auto!important}.form .help{color:#999;padding-top:.6em;padding-bottom:.6em;display:inline-block}.ui.attached.header{background:#f0f0f0}.ui.attached.header .right{margin-top:-5px}.repository.new.fork form{margin:auto;width:800px!important}.repository.new.fork form .ui.message{text-align:center}.repository.new.fork form .header{padding-left:270px!important}.repository.new.fork form .inline.field>label{text-align:right;width:250px!important;word-wrap:break-word}.repository.new.fork form .help{margin-left:260px!important}.repository.new.fork form .dropdown .dropdown.icon{margin-top:-7px!important}.repository.new.fork form .dropdown .text{margin-right:0!important}.repository.new.fork form .dropdown .text i{margin-right:0!important}.repository.new.fork form input,.repository.new.fork form textarea{width:50%!important}.repository{padding-top:15px;padding-bottom:120px}.repository .head{height:75px;padding-top:20px;background-color:#FCFCFC}.repository .head .mega-octicon{width:30px}.repository .head .fork-flag,.repository .head a{font-weight:300}.repository .head .ui.label{margin-top:5px;vertical-align:top}.repository .head .fork-flag{margin-left:38px;display:block;font-size:11px;line-height:10px;white-space:nowrap}.repository .head .button{margin-left:10px}.repository .head .button i{margin-right:5px}.repository .head .num{font-weight:700}.repository .head .octicon{height:5px}.repository .navbar{height:60px;padding-top:20px}.repository .navbar .ui.secondary.menu .item{margin-left:-10px;margin-top:-7px}.repository .navbar .ui.secondary.menu .item>.input .color-picker,.repository .navbar .ui.secondary.menu .item>.input .new-label-input{background-color:#fff;border:1px solid rgba(0,0,0,.15)}.repository .navbar .ui.secondary.menu .item.input{margin-right:-7px}.repository .navbar .ui.secondary.menu .item .new-label-input{width:150px}.repository .navbar .ui.secondary.menu .item .color-picker{height:35px;width:auto;padding-left:30px}.repository .navbar .ui.secondary.menu .item .minicolors-swatch.minicolors-sprite{top:10px;left:10px;width:15px;height:15px}.repository .navbar .ui.secondary.menu .item.precolors{padding-left:0;padding-right:0;margin-right:10px;width:120px}.repository .navbar .ui.secondary.menu .item.precolors .color{float:left;width:15px;height:15px}.repository .filter.menu .label.color{margin-left:17px;padding:0 8px}.repository .filter.menu .octicon{float:left;margin-left:-5px;margin-right:-7px}.repository .filter.menu .menu{max-height:300px;overflow-x:auto;right:0!important;left:auto!important}.repository .filter.menu .menu .clickable .name{padding-left:15px!important}.repository .page.buttons{padding-top:15px}.repository .issue.list{clear:both;list-style:none}.repository .issue.list>.item{padding-top:15px;padding-bottom:10px;border-bottom:1px dashed #AAA}.repository .issue.list>.item .title{color:#444;font-size:15px;font-weight:700;margin:0 6px}.repository .issue.list>.item .title:hover{color:#000}.repository .issue.list>.item .comment{padding-right:10px;color:#666}.repository .issue.list>.item .desc{padding-top:5px;color:#999}.repository .issue.list>.item .desc a.milestone{padding-left:5px;color:#999!important}.repository .issue.list>.item .desc a.milestone:hover{color:#000!important}.repository .label.list{clear:both;list-style:none}.repository .label.list .item{padding-top:10px;padding-bottom:10px;border-bottom:1px dashed #AAA}.repository .label.list .item a{font-size:15px;padding-top:5px;padding-right:10px;color:#666}.repository .label.list .item a:hover{color:#000}.repository .label.list .item a.open-issues{margin-right:30px}.repository .milestone.list{clear:both;list-style:none}.repository .milestone.list>.item{padding-top:10px;padding-bottom:10px;border-bottom:1px dashed #AAA}.repository .milestone.list>.item>a{padding-top:5px;padding-right:10px;color:#000}.repository .milestone.list>.item>a:hover{color:#4078c0}.repository .milestone.list>.item .ui.progress{width:40%;padding:0;border:0;margin:0}.repository .milestone.list>.item .ui.progress .bar{height:20px}.repository .milestone.list>.item .meta{color:#999;padding-top:5px}.repository .milestone.list>.item .meta .issue-stats .octicon{padding-left:5px}.repository .milestone.list>.item .meta .overdue{color:red}.repository .milestone.list>.item .operate{margin-top:-15px}.repository .milestone.list>.item .operate>a{font-size:15px;padding-top:5px;padding-right:10px;color:#666}.repository .milestone.list>.item .operate>a:hover{color:#000}.repository .milestone.list>.item .content{padding-top:10px}.repository.new.milestone textarea{height:200px}.repository.settings .content{padding-left:20px!important}.repository.compare.pull .choose.branch .octicon{padding-right:10px}.repository .filter.dropdown .menu{margin-top:1px!important}.repository .filter.dropdown .menu .items{max-height:300px;overflow-y:auto}.repository .filter.dropdown .menu .items .item{position:relative;cursor:pointer;display:block;border:none;height:auto;border-top:none;line-height:1em;color:rgba(0,0,0,.8);padding:.71428571em 1.14285714em!important;font-size:1rem;text-transform:none;font-weight:400;box-shadow:none;-webkit-touch-callout:none}.repository .filter.dropdown .menu .items .item.active{font-weight:700}.repository .filter.dropdown .menu .items .item:hover{background:rgba(0,0,0,.05);color:rgba(0,0,0,.8);z-index:13}.settings .key.list .item:not(:first-child){border-top:1px solid #eaeaea}.settings .key.list .ssh-key-state-indicator{float:left;color:gray;padding-left:10px;padding-top:10px}.settings .key.list .ssh-key-state-indicator.active{color:#6cc644}.settings .key.list .meta{padding-top:5px}.settings .key.list .print{color:#767676}.settings .key.list .activity{color:#666}.edit-label.modal .color-picker{margin-top:-8px!important;height:35px;width:auto!important;padding-left:30px!important}.edit-label.modal .minicolors-swatch.minicolors-sprite{top:1px;left:10px;width:15px;height:15px}.edit-label.modal .precolors{margin-bottom:-11px!important;padding-left:0!important;padding-right:0!important;margin-right:10px!important;width:120px!important}.edit-label.modal .precolors .color{float:left;margin:0!important;width:15px;height:15px} \ No newline at end of file diff --git a/public/js/gogs.js b/public/js/gogs.js index 7e57a5e14..2db397f06 100644 --- a/public/js/gogs.js +++ b/public/js/gogs.js @@ -93,6 +93,17 @@ function initRepository() { $('#add-deploy-key-panel').show(); }); } + + // Pull request + if ($('.repository.compare.pull').length > 0) { + $('.choose.branch .dropdown').dropdown({ + action: 'hide', + fullTextSearch: true, + onNoResults: function () { + $('.choose.branch .dropdown .active').addClass('selected'); + } + }); + } }; $(document).ready(function () { diff --git a/public/less/_repository.less b/public/less/_repository.less index bdea35c0c..b8fd94000 100644 --- a/public/less/_repository.less +++ b/public/less/_repository.less @@ -223,6 +223,46 @@ padding-left: 20px!important; } } + + &.compare.pull { + .choose.branch { + .octicon { + padding-right: 10px; + } + } + } + + .filter.dropdown .menu { + margin-top: 1px!important; + .items { + max-height: 300px; + overflow-y: auto; + .item { + position: relative; + cursor: pointer; + display: block; + border: none; + height: auto; + border-top: none; + line-height: 1em; + color: rgba(0,0,0,.8); + padding: .71428571em 1.14285714em!important; + font-size: 1rem; + text-transform: none; + font-weight: 400; + box-shadow: none; + -webkit-touch-callout: none; + &.active { + font-weight: 700; + } + &:hover { + background: rgba(0,0,0,.05); + color: rgba(0,0,0,.8); + z-index: 13; + } + } + } + } } .settings .key.list { diff --git a/routers/admin/users.go b/routers/admin/users.go index 12c52236f..2af3cdbc1 100644 --- a/routers/admin/users.go +++ b/routers/admin/users.go @@ -139,9 +139,9 @@ func EditUser(ctx *middleware.Context) { return } - u, err := models.GetUserById(uid) + u, err := models.GetUserByID(uid) if err != nil { - ctx.Handle(500, "GetUserById", err) + ctx.Handle(500, "GetUserByID", err) return } @@ -166,7 +166,7 @@ func EditUserPost(ctx *middleware.Context, form auth.AdminEditUserForm) { return } - u, err := models.GetUserById(uid) + u, err := models.GetUserByID(uid) if err != nil { ctx.Handle(500, "GetUserById", err) return @@ -219,9 +219,9 @@ func DeleteUser(ctx *middleware.Context) { return } - u, err := models.GetUserById(uid) + u, err := models.GetUserByID(uid) if err != nil { - ctx.Handle(500, "GetUserById", err) + ctx.Handle(500, "GetUserByID", err) return } diff --git a/routers/api/v1/repo.go b/routers/api/v1/repo.go index fdf05c052..c6dabfcb8 100644 --- a/routers/api/v1/repo.go +++ b/routers/api/v1/repo.go @@ -28,7 +28,7 @@ func ToApiRepository(owner *models.User, repo *models.Repository, permission api log.Error(4, "CloneLink: %v", err) } return &api.Repository{ - Id: repo.Id, + Id: repo.ID, Owner: *ToApiUser(owner), FullName: owner.Name + "/" + repo.Name, Private: repo.IsPrivate, @@ -55,7 +55,7 @@ func SearchRepos(ctx *middleware.Context) { if ctx.User.Id == opt.Uid { opt.Private = true } else { - u, err := models.GetUserById(opt.Uid) + u, err := models.GetUserByID(opt.Uid) if err != nil { ctx.JSON(500, map[string]interface{}{ "ok": false, @@ -89,7 +89,7 @@ func SearchRepos(ctx *middleware.Context) { return } results[i] = &api.Repository{ - Id: repos[i].Id, + Id: repos[i].ID, FullName: path.Join(repos[i].Owner.Name, repos[i].Name), } } @@ -111,7 +111,7 @@ func createRepo(ctx *middleware.Context, owner *models.User, opt api.CreateRepoO } else { log.Error(4, "CreateRepository: %v", err) if repo != nil { - if err = models.DeleteRepository(ctx.User.Id, repo.Id, ctx.User.Name); err != nil { + if err = models.DeleteRepository(ctx.User.Id, repo.ID, ctx.User.Name); err != nil { log.Error(4, "DeleteRepository: %v", err) } } @@ -172,7 +172,7 @@ func MigrateRepo(ctx *middleware.Context, form auth.MigrateRepoForm) { ctxUser := u // Not equal means current user is an organization. if form.Uid != u.Id { - org, err := models.GetUserById(form.Uid) + org, err := models.GetUserByID(form.Uid) if err != nil { if models.IsErrUserNotExist(err) { ctx.HandleAPI(422, err) @@ -219,7 +219,7 @@ func MigrateRepo(ctx *middleware.Context, form auth.MigrateRepoForm) { repo, err := models.MigrateRepository(ctxUser, form.RepoName, form.Description, form.Private, form.Mirror, remoteAddr) if err != nil { if repo != nil { - if errDelete := models.DeleteRepository(ctxUser.Id, repo.Id, ctxUser.Name); errDelete != nil { + if errDelete := models.DeleteRepository(ctxUser.Id, repo.ID, ctxUser.Name); errDelete != nil { log.Error(4, "DeleteRepository: %v", errDelete) } } diff --git a/routers/api/v1/repo_hooks.go b/routers/api/v1/repo_hooks.go index afe18a005..0348c6839 100644 --- a/routers/api/v1/repo_hooks.go +++ b/routers/api/v1/repo_hooks.go @@ -17,7 +17,7 @@ import ( // GET /repos/:username/:reponame/hooks // https://developer.github.com/v3/repos/hooks/#list-hooks func ListRepoHooks(ctx *middleware.Context) { - hooks, err := models.GetWebhooksByRepoId(ctx.Repo.Repository.Id) + hooks, err := models.GetWebhooksByRepoId(ctx.Repo.Repository.ID) if err != nil { ctx.JSON(500, &base.ApiJsonErr{"GetWebhooksByRepoId: " + err.Error(), base.DOC_URL}) return @@ -67,7 +67,7 @@ func CreateRepoHook(ctx *middleware.Context, form api.CreateHookOption) { } w := &models.Webhook{ - RepoId: ctx.Repo.Repository.Id, + RepoId: ctx.Repo.Repository.ID, Url: form.Config["url"], ContentType: models.ToHookContentType(form.Config["content_type"]), Secret: form.Config["secret"], diff --git a/routers/home.go b/routers/home.go index dd604ec7e..14a123f10 100644 --- a/routers/home.go +++ b/routers/home.go @@ -57,7 +57,7 @@ func Explore(ctx *middleware.Context) { } for _, repo := range repos { if err = repo.GetOwner(); err != nil { - ctx.Handle(500, "GetOwner", fmt.Errorf("%d: %v", repo.Id, err)) + ctx.Handle(500, "GetOwner", fmt.Errorf("%d: %v", repo.ID, err)) return } } diff --git a/routers/repo/http.go b/routers/repo/http.go index 45b0ec59c..54ea91cad 100644 --- a/routers/repo/http.go +++ b/routers/repo/http.go @@ -122,7 +122,7 @@ func Http(ctx *middleware.Context) { } return } - authUser, err = models.GetUserById(token.Uid) + authUser, err = models.GetUserByID(token.Uid) if err != nil { ctx.Handle(500, "GetUserById", err) return @@ -191,7 +191,7 @@ func Http(ctx *middleware.Context) { // FIXME: handle error. if err = models.Update(refName, oldCommitId, newCommitId, authUsername, username, reponame, authUser.Id); err == nil { - models.HookQueue.AddRepoID(repo.Id) + models.HookQueue.AddRepoID(repo.ID) } } diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 9d59d19a5..89eb7e648 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -44,7 +44,7 @@ var ( ) func RetrieveLabels(ctx *middleware.Context) { - labels, err := models.GetLabels(ctx.Repo.Repository.Id) + labels, err := models.GetLabels(ctx.Repo.Repository.ID) if err != nil { ctx.Handle(500, "RetrieveLabels.GetLabels: %v", err) return @@ -95,7 +95,7 @@ func Issues(ctx *middleware.Context) { selectLabels := ctx.Query("labels") milestoneID := ctx.QueryInt64("milestone") isShowClosed := ctx.Query("state") == "closed" - issueStats := models.GetIssueStats(repo.Id, uid, com.StrTo(selectLabels).MustInt64(), milestoneID, isShowClosed, filterMode) + issueStats := models.GetIssueStats(repo.ID, uid, com.StrTo(selectLabels).MustInt64(), milestoneID, isShowClosed, filterMode) page := ctx.QueryInt("page") if page <= 1 { @@ -111,7 +111,7 @@ func Issues(ctx *middleware.Context) { ctx.Data["Page"] = paginater.New(total, setting.IssuePagingNum, page, 5) // Get issues. - issues, err := models.Issues(uid, assigneeID, repo.Id, posterID, milestoneID, + issues, err := models.Issues(uid, assigneeID, repo.ID, posterID, milestoneID, page, isShowClosed, filterMode == models.FM_MENTION, selectLabels, ctx.Query("sortType")) if err != nil { ctx.Handle(500, "GetIssues: %v", err) @@ -119,7 +119,7 @@ func Issues(ctx *middleware.Context) { } // Get issue-user pairs. - pairs, err := models.GetIssueUserPairs(repo.Id, posterID, isShowClosed) + pairs, err := models.GetIssueUserPairs(repo.ID, posterID, isShowClosed) if err != nil { ctx.Handle(500, "GetIssueUserPairs: %v", err) return @@ -153,7 +153,7 @@ func Issues(ctx *middleware.Context) { ctx.Data["Issues"] = issues // Get milestones. - miles, err := models.GetAllRepoMilestones(repo.Id) + miles, err := models.GetAllRepoMilestones(repo.ID) if err != nil { ctx.Handle(500, "GetAllRepoMilestones: %v", err) return @@ -185,12 +185,12 @@ func CreateIssue(ctx *middleware.Context) { err error ) // Get all milestones. - ctx.Data["OpenMilestones"], err = models.GetMilestones(repo.Id, -1, false) + ctx.Data["OpenMilestones"], err = models.GetMilestones(repo.ID, -1, false) if err != nil { ctx.Handle(500, "GetMilestones.1: %v", err) return } - ctx.Data["ClosedMilestones"], err = models.GetMilestones(repo.Id, -1, true) + ctx.Data["ClosedMilestones"], err = models.GetMilestones(repo.ID, -1, true) if err != nil { ctx.Handle(500, "GetMilestones.2: %v", err) return @@ -229,12 +229,12 @@ func CreateIssuePost(ctx *middleware.Context, form auth.CreateIssueForm) { var err error // Get all milestones. - _, err = models.GetMilestones(ctx.Repo.Repository.Id, -1, false) + _, err = models.GetMilestones(ctx.Repo.Repository.ID, -1, false) if err != nil { send(500, nil, err) return } - _, err = models.GetMilestones(ctx.Repo.Repository.Id, -1, true) + _, err = models.GetMilestones(ctx.Repo.Repository.ID, -1, true) if err != nil { send(500, nil, err) return @@ -256,7 +256,7 @@ func CreateIssuePost(ctx *middleware.Context, form auth.CreateIssueForm) { form.AssigneeId = 0 } issue := &models.Issue{ - RepoID: ctx.Repo.Repository.Id, + RepoID: ctx.Repo.Repository.ID, Index: int64(ctx.Repo.Repository.NumIssues) + 1, Name: form.IssueName, PosterID: ctx.User.Id, @@ -297,7 +297,7 @@ func CreateIssuePost(ctx *middleware.Context, form auth.CreateIssueForm) { ActEmail: ctx.User.Email, OpType: models.CREATE_ISSUE, Content: fmt.Sprintf("%d|%s", issue.Index, issue.Name), - RepoID: ctx.Repo.Repository.Id, + RepoID: ctx.Repo.Repository.ID, RepoUserName: ctx.Repo.Owner.Name, RepoName: ctx.Repo.Repository.Name, RefName: ctx.Repo.BranchName, @@ -332,7 +332,7 @@ func CreateIssuePost(ctx *middleware.Context, form auth.CreateIssueForm) { return } } - log.Trace("%d Issue created: %d", ctx.Repo.Repository.Id, issue.ID) + log.Trace("%d Issue created: %d", ctx.Repo.Repository.ID, issue.ID) send(200, fmt.Sprintf("%s/%s/%s/issues/%d", setting.AppSubUrl, ctx.Params(":username"), ctx.Params(":reponame"), issue.Index), nil) } @@ -357,7 +357,7 @@ func ViewIssue(ctx *middleware.Context) { return } - issue, err := models.GetIssueByIndex(ctx.Repo.Repository.Id, idx) + issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, idx) if err != nil { if err == models.ErrIssueNotExist { ctx.Handle(404, "GetIssueByIndex", err) @@ -372,7 +372,7 @@ func ViewIssue(ctx *middleware.Context) { ctx.Handle(500, "GetLabels", err) return } - labels, err := models.GetLabels(ctx.Repo.Repository.Id) + labels, err := models.GetLabels(ctx.Repo.Repository.ID) if err != nil { ctx.Handle(500, "GetLabels.2", err) return @@ -394,12 +394,12 @@ func ViewIssue(ctx *middleware.Context) { } // Get all milestones. - ctx.Data["OpenMilestones"], err = models.GetMilestones(ctx.Repo.Repository.Id, -1, false) + ctx.Data["OpenMilestones"], err = models.GetMilestones(ctx.Repo.Repository.ID, -1, false) if err != nil { ctx.Handle(500, "GetMilestones.1: %v", err) return } - ctx.Data["ClosedMilestones"], err = models.GetMilestones(ctx.Repo.Repository.Id, -1, true) + ctx.Data["ClosedMilestones"], err = models.GetMilestones(ctx.Repo.Repository.ID, -1, true) if err != nil { ctx.Handle(500, "GetMilestones.2: %v", err) return @@ -439,7 +439,7 @@ func ViewIssue(ctx *middleware.Context) { // Get posters. for i := range comments { - u, err := models.GetUserById(comments[i].PosterId) + u, err := models.GetUserByID(comments[i].PosterId) if err != nil { ctx.Handle(500, "GetUserById.2: %v", err) return @@ -469,7 +469,7 @@ func UpdateIssue(ctx *middleware.Context, form auth.CreateIssueForm) { return } - issue, err := models.GetIssueByIndex(ctx.Repo.Repository.Id, idx) + issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, idx) if err != nil { if err == models.ErrIssueNotExist { ctx.Handle(404, "issue.UpdateIssue", err) @@ -517,7 +517,7 @@ func UpdateIssueLabel(ctx *middleware.Context) { return } - issue, err := models.GetIssueByIndex(ctx.Repo.Repository.Id, idx) + issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, idx) if err != nil { if err == models.ErrIssueNotExist { ctx.Handle(404, "issue.UpdateIssueLabel(GetIssueByIndex)", err) @@ -762,7 +762,7 @@ func Comment(ctx *middleware.Context) { return } - issue, err := models.GetIssueByIndex(ctx.Repo.Repository.Id, index) + issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, index) if err != nil { if err == models.ErrIssueNotExist { send(404, nil, err) @@ -820,7 +820,7 @@ func Comment(ctx *middleware.Context) { cmtType = models.COMMENT_TYPE_REOPEN } - if _, err = models.CreateComment(ctx.User.Id, ctx.Repo.Repository.Id, issue.ID, 0, 0, cmtType, "", nil); err != nil { + if _, err = models.CreateComment(ctx.User.Id, ctx.Repo.Repository.ID, issue.ID, 0, 0, cmtType, "", nil); err != nil { send(200, nil, err) return } @@ -836,7 +836,7 @@ func Comment(ctx *middleware.Context) { if len(content) > 0 || len(ctx.Req.MultipartForm.File["attachments"]) > 0 { switch ctx.Params(":action") { case "new": - if comment, err = models.CreateComment(ctx.User.Id, ctx.Repo.Repository.Id, issue.ID, 0, 0, models.COMMENT_TYPE_COMMENT, content, nil); err != nil { + if comment, err = models.CreateComment(ctx.User.Id, ctx.Repo.Repository.ID, issue.ID, 0, 0, models.COMMENT_TYPE_COMMENT, content, nil); err != nil { send(500, nil, err) return } @@ -872,7 +872,7 @@ func Comment(ctx *middleware.Context) { ActEmail: ctx.User.Email, OpType: models.COMMENT_ISSUE, Content: fmt.Sprintf("%d|%s", issue.Index, strings.Split(content, "\n")[0]), - RepoID: ctx.Repo.Repository.Id, + RepoID: ctx.Repo.Repository.ID, RepoUserName: ctx.Repo.Owner.LowerName, RepoName: ctx.Repo.Repository.LowerName, IsPrivate: ctx.Repo.Repository.IsPrivate, @@ -927,7 +927,7 @@ func NewLabel(ctx *middleware.Context, form auth.CreateLabelForm) { } l := &models.Label{ - RepoId: ctx.Repo.Repository.Id, + RepoId: ctx.Repo.Repository.ID, Name: form.Title, Color: form.Color, } @@ -960,7 +960,7 @@ func UpdateLabel(ctx *middleware.Context, form auth.CreateLabelForm) { } func DeleteLabel(ctx *middleware.Context) { - if err := models.DeleteLabel(ctx.Repo.Repository.Id, ctx.QueryInt64("id")); err != nil { + if err := models.DeleteLabel(ctx.Repo.Repository.ID, ctx.QueryInt64("id")); err != nil { ctx.Flash.Error("DeleteLabel: " + err.Error()) } else { ctx.Flash.Success(ctx.Tr("repo.issues.label_deletion_success")) @@ -977,7 +977,7 @@ func Milestones(ctx *middleware.Context) { ctx.Data["PageIsMilestones"] = true isShowClosed := ctx.Query("state") == "closed" - openCount, closedCount := models.MilestoneStats(ctx.Repo.Repository.Id) + openCount, closedCount := models.MilestoneStats(ctx.Repo.Repository.ID) ctx.Data["OpenCount"] = openCount ctx.Data["ClosedCount"] = closedCount @@ -994,7 +994,7 @@ func Milestones(ctx *middleware.Context) { } ctx.Data["Page"] = paginater.New(total, setting.IssuePagingNum, page, 5) - miles, err := models.GetMilestones(ctx.Repo.Repository.Id, page, isShowClosed) + miles, err := models.GetMilestones(ctx.Repo.Repository.ID, page, isShowClosed) if err != nil { ctx.Handle(500, "GetMilestones", err) return @@ -1043,7 +1043,7 @@ func NewMilestonePost(ctx *middleware.Context, form auth.CreateMilestoneForm) { } if err = models.NewMilestone(&models.Milestone{ - RepoID: ctx.Repo.Repository.Id, + RepoID: ctx.Repo.Repository.ID, Name: form.Title, Content: form.Content, Deadline: deadline, diff --git a/routers/repo/pull.go b/routers/repo/pull.go index a4ebb91a3..c035cc8cb 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -5,26 +5,31 @@ package repo import ( + "fmt" + "strings" + "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/auth" "github.com/gogits/gogs/modules/base" + "github.com/gogits/gogs/modules/git" "github.com/gogits/gogs/modules/log" "github.com/gogits/gogs/modules/middleware" "github.com/gogits/gogs/modules/setting" ) const ( - FORK base.TplName = "repo/pulls/fork" - PULLS base.TplName = "repo/pulls" + FORK base.TplName = "repo/pulls/fork" + COMPARE_PULL base.TplName = "repo/pulls/compare" + PULLS base.TplName = "repo/pulls" ) func getForkRepository(ctx *middleware.Context) *models.Repository { - forkRepo, err := models.GetRepositoryById(ctx.ParamsInt64(":repoid")) + forkRepo, err := models.GetRepositoryByID(ctx.ParamsInt64(":repoid")) if err != nil { if models.IsErrRepoNotExist(err) { - ctx.Handle(404, "GetRepositoryById", nil) + ctx.Handle(404, "GetRepositoryByID", nil) } else { - ctx.Handle(500, "GetRepositoryById", err) + ctx.Handle(500, "GetRepositoryByID", err) } return nil } @@ -78,7 +83,7 @@ func ForkPost(ctx *middleware.Context, form auth.CreateRepoForm) { return } - repo, has := models.HasForkedRepo(ctxUser.Id, forkRepo.Id) + repo, has := models.HasForkedRepo(ctxUser.Id, forkRepo.ID) if has { ctx.Redirect(setting.AppSubUrl + "/" + ctxUser.Name + "/" + repo.Name) return @@ -110,10 +115,56 @@ func ForkPost(ctx *middleware.Context, form auth.CreateRepoForm) { return } - log.Trace("Repository forked[%d]: %s/%s", forkRepo.Id, ctxUser.Name, repo.Name) + log.Trace("Repository forked[%d]: %s/%s", forkRepo.ID, ctxUser.Name, repo.Name) ctx.Redirect(setting.AppSubUrl + "/" + ctxUser.Name + "/" + repo.Name) } +func CompareAndPullRequest(ctx *middleware.Context) { + // Get compare information. + infos := strings.Split(ctx.Params("*"), "...") + if len(infos) != 2 { + ctx.Handle(404, "CompareAndPullRequest", nil) + return + } + + baseBranch := infos[0] + ctx.Data["BaseBranch"] = baseBranch + + headInfos := strings.Split(infos[1], ":") + if len(headInfos) != 2 { + ctx.Handle(404, "CompareAndPullRequest", nil) + return + } + headUser := headInfos[0] + headBranch := headInfos[1] + ctx.Data["HeadBranch"] = headBranch + + // TODO: check if branches are valid. + fmt.Println(baseBranch, headUser, headBranch) + + // TODO: add organization support + // Check if current user has fork of repository. + headRepo, has := models.HasForkedRepo(ctx.User.Id, ctx.Repo.Repository.ID) + if !has { + ctx.Handle(404, "HasForkedRepo", nil) + return + } + + headGitRepo, err := git.OpenRepository(models.RepoPath(ctx.User.Name, headRepo.Name)) + if err != nil { + ctx.Handle(500, "OpenRepository", err) + return + } + headBranches, err := headGitRepo.GetBranches() + if err != nil { + ctx.Handle(500, "GetBranches", err) + return + } + ctx.Data["HeadBranches"] = headBranches + + ctx.HTML(200, COMPARE_PULL) +} + func Pulls(ctx *middleware.Context) { ctx.Data["IsRepoToolbarPulls"] = true ctx.HTML(200, PULLS) diff --git a/routers/repo/release.go b/routers/repo/release.go index 52d78b196..30d5f60b3 100644 --- a/routers/repo/release.go +++ b/routers/repo/release.go @@ -29,7 +29,7 @@ func Releases(ctx *middleware.Context) { return } - rels, err := models.GetReleasesByRepoId(ctx.Repo.Repository.Id) + rels, err := models.GetReleasesByRepoId(ctx.Repo.Repository.ID) if err != nil { ctx.Handle(500, "GetReleasesByRepoId", err) return @@ -45,7 +45,7 @@ func Releases(ctx *middleware.Context) { continue } if rel.TagName == rawTag { - rel.Publisher, err = models.GetUserById(rel.PublisherId) + rel.Publisher, err = models.GetUserByID(rel.PublisherId) if err != nil { ctx.Handle(500, "GetUserById", err) return @@ -105,7 +105,7 @@ func Releases(ctx *middleware.Context) { continue } - rel.Publisher, err = models.GetUserById(rel.PublisherId) + rel.Publisher, err = models.GetUserByID(rel.PublisherId) if err != nil { ctx.Handle(500, "GetUserById", err) return @@ -185,7 +185,7 @@ func NewReleasePost(ctx *middleware.Context, form auth.NewReleaseForm) { } rel := &models.Release{ - RepoId: ctx.Repo.Repository.Id, + RepoId: ctx.Repo.Repository.ID, PublisherId: ctx.User.Id, Title: form.Title, TagName: form.TagName, @@ -217,7 +217,7 @@ func EditRelease(ctx *middleware.Context) { } tagName := ctx.Params(":tagname") - rel, err := models.GetRelease(ctx.Repo.Repository.Id, tagName) + rel, err := models.GetRelease(ctx.Repo.Repository.ID, tagName) if err != nil { if err == models.ErrReleaseNotExist { ctx.Handle(404, "GetRelease", err) @@ -240,7 +240,7 @@ func EditReleasePost(ctx *middleware.Context, form auth.EditReleaseForm) { } tagName := ctx.Params(":tagname") - rel, err := models.GetRelease(ctx.Repo.Repository.Id, tagName) + rel, err := models.GetRelease(ctx.Repo.Repository.ID, tagName) if err != nil { if err == models.ErrReleaseNotExist { ctx.Handle(404, "GetRelease", err) diff --git a/routers/repo/repo.go b/routers/repo/repo.go index dde8b5846..533bd569a 100644 --- a/routers/repo/repo.go +++ b/routers/repo/repo.go @@ -33,7 +33,7 @@ func checkContextUser(ctx *middleware.Context, uid int64) *models.User { return ctx.User } - org, err := models.GetUserById(uid) + org, err := models.GetUserByID(uid) if models.IsErrUserNotExist(err) { return ctx.User } @@ -112,7 +112,7 @@ func CreatePost(ctx *middleware.Context, form auth.CreateRepoForm) { } if repo != nil { - if errDelete := models.DeleteRepository(ctxUser.Id, repo.Id, ctxUser.Name); errDelete != nil { + if errDelete := models.DeleteRepository(ctxUser.Id, repo.ID, ctxUser.Name); errDelete != nil { log.Error(4, "DeleteRepository: %v", errDelete) } } @@ -209,7 +209,7 @@ func MigratePost(ctx *middleware.Context, form auth.MigrateRepoForm) { } if repo != nil { - if errDelete := models.DeleteRepository(ctxUser.Id, repo.Id, ctxUser.Name); errDelete != nil { + if errDelete := models.DeleteRepository(ctxUser.Id, repo.ID, ctxUser.Name); errDelete != nil { log.Error(4, "DeleteRepository: %v", errDelete) } } @@ -239,13 +239,13 @@ func Action(ctx *middleware.Context) { var err error switch ctx.Params(":action") { case "watch": - err = models.WatchRepo(ctx.User.Id, ctx.Repo.Repository.Id, true) + err = models.WatchRepo(ctx.User.Id, ctx.Repo.Repository.ID, true) case "unwatch": - err = models.WatchRepo(ctx.User.Id, ctx.Repo.Repository.Id, false) + err = models.WatchRepo(ctx.User.Id, ctx.Repo.Repository.ID, false) case "star": - err = models.StarRepo(ctx.User.Id, ctx.Repo.Repository.Id, true) + err = models.StarRepo(ctx.User.Id, ctx.Repo.Repository.ID, true) case "unstar": - err = models.StarRepo(ctx.User.Id, ctx.Repo.Repository.Id, false) + err = models.StarRepo(ctx.User.Id, ctx.Repo.Repository.ID, false) case "desc": if !ctx.Repo.IsOwner() { ctx.Error(404) diff --git a/routers/repo/setting.go b/routers/repo/setting.go index 1d5e0702a..551ba1151 100644 --- a/routers/repo/setting.go +++ b/routers/repo/setting.go @@ -160,7 +160,7 @@ func SettingsPost(ctx *middleware.Context, form auth.RepoSettingForm) { return } - if err := models.DeleteRepository(ctx.Repo.Owner.Id, ctx.Repo.Repository.Id, ctx.Repo.Owner.Name); err != nil { + if err := models.DeleteRepository(ctx.Repo.Owner.Id, ctx.Repo.Repository.ID, ctx.Repo.Owner.Name); err != nil { ctx.Handle(500, "DeleteRepository", err) return } @@ -262,7 +262,7 @@ func Webhooks(ctx *middleware.Context) { return } - ws, err := models.GetWebhooksByRepoId(ctx.Repo.Repository.Id) + ws, err := models.GetWebhooksByRepoId(ctx.Repo.Repository.ID) if err != nil { ctx.Handle(500, "GetWebhooksByRepoId", err) return @@ -569,7 +569,7 @@ func getOrgRepoCtx(ctx *middleware.Context) (*OrgRepoCtx, error) { if _, ok := ctx.Data["RepoLink"]; ok { return &OrgRepoCtx{ OrgId: int64(0), - RepoId: ctx.Repo.Repository.Id, + RepoId: ctx.Repo.Repository.ID, Link: ctx.Repo.RepoLink, NewTemplate: HOOK_NEW, }, nil @@ -605,7 +605,7 @@ func TriggerHook(ctx *middleware.Context) { } return } - models.HookQueue.AddRepoID(repo.Id) + models.HookQueue.AddRepoID(repo.ID) } func GitHooks(ctx *middleware.Context) { @@ -663,7 +663,7 @@ func SettingsDeployKeys(ctx *middleware.Context) { ctx.Data["Title"] = ctx.Tr("repo.settings") ctx.Data["PageIsSettingsKeys"] = true - keys, err := models.ListDeployKeys(ctx.Repo.Repository.Id) + keys, err := models.ListDeployKeys(ctx.Repo.Repository.ID) if err != nil { ctx.Handle(500, "ListDeployKeys", err) return @@ -695,7 +695,7 @@ func SettingsDeployKeysPost(ctx *middleware.Context, form auth.AddSSHKeyForm) { } } - if err = models.AddDeployKey(ctx.Repo.Repository.Id, form.Title, content); err != nil { + if err = models.AddDeployKey(ctx.Repo.Repository.ID, form.Title, content); err != nil { ctx.Data["HasError"] = true switch { case models.IsErrKeyAlreadyExist(err): @@ -710,7 +710,7 @@ func SettingsDeployKeysPost(ctx *middleware.Context, form auth.AddSSHKeyForm) { return } - log.Trace("Deploy key added: %d", ctx.Repo.Repository.Id) + log.Trace("Deploy key added: %d", ctx.Repo.Repository.ID) ctx.Flash.Success(ctx.Tr("repo.settings.add_key_success", form.Title)) ctx.Redirect(ctx.Repo.RepoLink + "/settings/keys") } diff --git a/routers/user/home.go b/routers/user/home.go index c38dba520..a36483630 100644 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -104,7 +104,7 @@ func Dashboard(ctx *middleware.Context) { for _, act := range actions { if act.IsPrivate { // This prevents having to retrieve the repository for each action - repo := &models.Repository{Id: act.RepoID, IsPrivate: true} + repo := &models.Repository{ID: act.RepoID, IsPrivate: true} if act.RepoUserName != ctx.User.LowerName { if has, _ := models.HasAccess(ctx.User, repo, models.ACCESS_MODE_READ); !has { continue @@ -212,7 +212,7 @@ func Profile(ctx *middleware.Context) { continue } // This prevents having to retrieve the repository for each action - repo := &models.Repository{Id: act.RepoID, IsPrivate: true} + repo := &models.Repository{ID: act.RepoID, IsPrivate: true} if act.RepoUserName != ctx.User.LowerName { if has, _ := models.HasAccess(ctx.User, repo, models.ACCESS_MODE_READ); !has { continue @@ -295,21 +295,21 @@ func Issues(ctx *middleware.Context) { continue } - repoIds = append(repoIds, repo.Id) + repoIds = append(repoIds, repo.ID) repo.NumOpenIssues = repo.NumIssues - repo.NumClosedIssues issueStats.AllCount += int64(repo.NumOpenIssues) if isShowClosed { if repo.NumClosedIssues > 0 { if filterMode == models.FM_CREATE { - repo.NumClosedIssues = int(models.GetIssueCountByPoster(ctx.User.Id, repo.Id, isShowClosed)) + repo.NumClosedIssues = int(models.GetIssueCountByPoster(ctx.User.Id, repo.ID, isShowClosed)) } showRepos = append(showRepos, repo) } } else { if repo.NumOpenIssues > 0 { if filterMode == models.FM_CREATE { - repo.NumOpenIssues = int(models.GetIssueCountByPoster(ctx.User.Id, repo.Id, isShowClosed)) + repo.NumOpenIssues = int(models.GetIssueCountByPoster(ctx.User.Id, repo.ID, isShowClosed)) } showRepos = append(showRepos, repo) } @@ -350,7 +350,7 @@ func Issues(ctx *middleware.Context) { } } - issues[i].Repo, err = models.GetRepositoryById(issues[i].RepoID) + issues[i].Repo, err = models.GetRepositoryByID(issues[i].RepoID) if err != nil { if models.IsErrRepoNotExist(err) { log.Warn("GetRepositoryById[%d]: repository not exist", issues[i].RepoID) diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl index 981e2ef72..5747ccecd 100644 --- a/templates/admin/repo/list.tmpl +++ b/templates/admin/repo/list.tmpl @@ -17,7 +17,7 @@ - + @@ -30,7 +30,7 @@ {{range .Repos}} - + diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index 514fef6b7..559835727 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -7,7 +7,7 @@
/
{{.Name}} {{if .IsMirror}}
{{$.i18n.Tr "mirror"}}
{{end}} - {{if .IsFork}}
{{$.i18n.Tr "repo.forked_from"}} {{SubStr .ForkRepo.RepoLink 1 -1}}
{{end}} + {{if .IsFork}}
{{$.i18n.Tr "repo.forked_from"}} {{SubStr .BaseRepo.RepoLink 1 -1}}
{{end}}
diff --git a/templates/repo/header_old.tmpl b/templates/repo/header_old.tmpl index 420cd1253..ecf9ed3a7 100644 --- a/templates/repo/header_old.tmpl +++ b/templates/repo/header_old.tmpl @@ -7,7 +7,7 @@ / {{.Name}} {{if .IsMirror}}{{$.i18n.Tr "mirror"}}{{end}} - {{if .IsFork}}forked from {{SubStr .ForkRepo.RepoLink 1 -1}}{{end}} + {{if .IsFork}}forked from {{SubStr .BaseRepo.RepoLink 1 -1}}{{end}}
IdID {{.i18n.Tr "admin.repos.owner"}} {{.i18n.Tr "admin.repos.name"}} {{.i18n.Tr "admin.repos.private"}}
{{.Id}}{{.ID}} {{.Owner.Name}} {{.Name}}