add action
export ok
Merge branch 'master' of github.com:crichon/tx

Conflicts:
	main/admin.py
merge