UbitUmarov 694720d7a9 Merge branch 'master' into httptests		2017-01-07 21:05:12 +00:00
..
Addons	Allow avatar to be charged group membership fees when a money module is in use	2017-01-06 21:15:58 -05:00
ApplicationPlugins	Fix errors introduced by incomplete understanding of what folded perms are	2017-01-06 13:17:43 +00:00
Capabilities	fix merge	2017-01-05 19:32:57 +00:00
ConsoleClient	Massive tab and trailing space cleanup	2017-01-05 19:07:37 +00:00
Data	Massive tab and trailing space cleanup	2017-01-05 19:07:37 +00:00
Framework	Merge branch 'master' into httptests	2017-01-07 21:05:12 +00:00
Region	Merge branch 'master' into httptests	2017-01-07 21:05:12 +00:00
Server	fix merge	2017-01-05 19:32:57 +00:00
Services	Fix the long-standing bug that object permissions set in inventory were lost	2017-01-06 17:05:00 +00:00
Tests	Massive tab and trailing space cleanup	2017-01-05 19:07:37 +00:00
Tools	Massive tab and trailing space cleanup	2017-01-05 19:07:37 +00:00