Browse Source

Merge branch 'master' into alias1-196-disable-agents

Conflicts:
app/assets/stylesheets/application.css.scss.erb
app/views/agents/_form.html.erb
app/views/agents/index.html.erb
app/views/agents/show.html.erb
app/views/events/index.html.erb

Andrew Cantino 11 years ago

parent

dea618cfe8 e4f294145b

commit

51c94cdb12

Diff Data Not Available.