Commit Graph
4 Commits
Author SHA1 Message Date
Matthew Jones be28a298eb Fix some inconsistencies after the merge 2013-11-08 10:04:12 -05:00
Matthew Jones a523c40635 Merge branch 'auditlog' of github.com:ansible/ansible-commander into
auditlog

Resolve some conflicts between the master branch model refactoring and
my auditlog work.

* 'auditlog' of github.com:ansible/ansible-commander:
  Initial backend implementation for AC-25, activity stream/audit love

Conflicts:
	awx/main/models/__init__.py
2013-11-08 09:53:42 -05:00
Matthew Jones cdccfee93a Initial backend implementation for AC-25, activity stream/audit love 2013-11-08 09:51:02 -05:00
Matthew Jones 25704af172 Initial backend implementation for AC-25, activity stream/audit love 2013-11-08 04:39:53 -05:00