Merge branch 'auditlog' of github.com:ansible/ansible-commander into

Browse Source

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

...

This commit is contained in:

Matthew Jones 2013-11-08 09:53:42 -05:00

parent cdccfee93a 25704af172

commit a523c40635

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available