Merge branch 'dev' into feature_primaries (1a9f598e) · 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

1a9f598e

Commit 1a9f598e authored 13 years ago by Lloyd Hilaiel

Downloads
- Plain Diff

Merge branch 'dev' into feature_primaries

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

parents 5b5f863b 6f54801f

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

ChangeLog 27 additions, 0 deletions

ChangeLog
example/rp/index.html 33 additions, 63 deletions

example/rp/index.html
resources/static/dialog/controllers/actions.js 2 additions, 2 deletions

resources/static/dialog/controllers/actions.js
resources/static/dialog/resources/state_machine.js 4 additions, 1 deletion

resources/static/dialog/resources/state_machine.js

with 66 additions and 66 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