Merge remote-tracking branch 'upstream/dev' into dev (1fe4d265) · Commits · Hexang 息壤平台 / persona · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

persona
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

1fe4d265

Commit 1fe4d265 authored 12 years ago by Zachary Carter

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/dev' into dev

parents 48c69847 79c21e67

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

resources/static/dialog/controllers/actions.js 2 additions, 0 deletions

resources/static/dialog/controllers/actions.js
resources/static/dialog/controllers/pick_email.js 5 additions, 1 deletion

resources/static/dialog/controllers/pick_email.js
resources/static/lib/hub.js 5 additions, 5 deletions

resources/static/lib/hub.js
resources/static/shared/modules/interaction_data.js 49 additions, 1 deletion

resources/static/shared/modules/interaction_data.js
resources/static/test/cases/controllers/pick_email.js 6 additions, 1 deletion

resources/static/test/cases/controllers/pick_email.js
resources/static/test/cases/shared/modules/interaction_data.js 31 additions, 1 deletion

...rces/static/test/cases/shared/modules/interaction_data.js

with 98 additions and 9 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment