Merge branch 'dev' into required_email_frontend (c64bf3b0) · 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

c64bf3b0

Commit c64bf3b0 authored 13 years ago by Lloyd Hilaiel

Downloads
- Plain Diff

Merge branch 'dev' into required_email_frontend

Conflicts:
	resources/static/dialog/controllers/dialog_controller.js

parents 3cce950a 2f11bff5

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

example/index.html 1 addition, 1 deletion

example/index.html
resources/static/dialog/controllers/dialog_controller.js 3 additions, 3 deletions

resources/static/dialog/controllers/dialog_controller.js
resources/static/dialog/resources/channel.js 7 additions, 2 deletions

resources/static/dialog/resources/channel.js
resources/static/include.js 7 additions, 3 deletions

resources/static/include.js
resources/static/relay/relay.js 0 additions, 2 deletions

resources/static/relay/relay.js
resources/static/test/qunit/resources/channel_unit_test.js 1 addition, 3 deletions

resources/static/test/qunit/resources/channel_unit_test.js

with 19 additions and 14 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