2 Commits (9f04e393391246ff43245a684daf459de40c652a)

Author	SHA1	Message	Date
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
Stéphane Bidoul	2a7ed7af2e	move all modules to __unported__ on master branch and set installable=False	2014-07-13 11:20:52 +02:00