server-tools/__unported__/base_optional_quick_create
Alexandre Fayolle 5e310b4c60 Merge branch '7.0' to master
Conflicts:
	.travis.yml
	__unported__/users_ldap_mail/__openerp__.py
	dbfilter_from_header/__init__.py
	disable_openerp_online/data/ir_ui_menu.xml
	mass_editing/__init__.py
	mass_editing/models/mass_object.py
	mass_editing/wizard/__init__.py
2014-08-18 08:56:41 +02:00
..
i18n move all modules to __unported__ on master branch and set installable=False 2014-07-13 11:20:52 +02:00
AUTHORS.txt move all modules to __unported__ on master branch and set installable=False 2014-07-13 11:20:52 +02:00
__init__.py move all modules to __unported__ on master branch and set installable=False 2014-07-13 11:20:52 +02:00
__openerp__.py Merge branch '7.0' to master 2014-08-18 08:56:41 +02:00
model.py Merge branch '7.0' to master 2014-08-18 08:56:41 +02:00
model_view.xml move all modules to __unported__ on master branch and set installable=False 2014-07-13 11:20:52 +02:00