Merge branch '9.0-mig-web_dashboard_tile' of github.com:adhoc-dev/web into 9.0-mig-web_dashboard_tile

Browse Source

Conflicts:
	web_dashboard_tile/models/tile_tile.py

...

This commit is contained in:

Nicolas Mac Rouillon

2016-12-13 16:49:03 -03:00

parent d75755dab5 839262a11b

commit fb3f97df0e

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

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

Diff Content Not Available