4 Commits

Author	SHA1	Message	Date
Klaus	3af281d648	Merge remote-tracking branch 'upstream/master' into merge-master-mconf	2017-07-17 13:33:45 -03:00
Klaus	54234cecac	Handling emoji messages	2017-07-13 10:15:42 -03:00
Klaus Klein	ca09b69555	Merge branch 'Acl' into Refactor2x ... * Acl: Add check to undefined role Lint to eslint Missing merge file Fix lint problems Change Acl lookup Change ACL to be more extensible Fix a few review comments Acl refactor working Mostly working, still problems with user subs Code refactored	2017-06-19 11:28:17 -03:00
Klaus Klein	c627deca36	Move api to api/1.1	2017-06-19 08:57:32 -03:00