Dmitriy Zaporozhets 6ace422c29 Merge branch 'master' into 6-0-dev ...

Conflicts:
	Gemfile
	Gemfile.lock

2013-07-08 09:50:10 +03:00

..

background_jobs

Renames resque resource to background_jobs

2013-05-30 09:46:28 +03:00

dashboard

Remove all team resources except models. Move models to deprecated directory

2013-06-18 21:22:34 +03:00

groups

Cleanup: removed unused routing/methods. Improved admin area usability

2013-06-22 14:11:20 +03:00

hooks

Updating documentation to reflect #3836 (resolving #4443)

2013-07-01 21:14:39 -05:00

logs

Result of misspellings run.

2013-03-17 19:46:54 +00:00

projects

Cleanup: removed unused routing/methods. Improved admin area usability

2013-06-22 14:11:20 +03:00

users

Rebasing on master

2013-06-26 11:08:55 -04:00