antisnatchor 6f73dd6a82 Merge remote-tracking branch 'upstream/master' ...

Conflicts:
	config.yaml

2012-04-18 15:27:22 +01:00

..

api

Updated admin_ui and console extensions code to reflect the move of initialization extension into the core.

2012-04-18 14:37:44 +01:00

classes

Year updated from 2011 to 2012

2011-12-31 22:24:36 +10:00

constants

Year updated from 2011 to 2012

2011-12-31 22:24:36 +10:00

controllers

Updated admin_ui and console extensions code to reflect the move of initialization extension into the core.

2012-04-18 14:37:44 +01:00

handlers

Year updated from 2011 to 2012

2011-12-31 22:24:36 +10:00

media

Merge remote-tracking branch 'upstream/master'. Fixed conflicts on config.yaml.

2012-04-14 20:44:17 +01:00

config.yaml

Moved BeEF credentials from admin_ui extension to the main config.yaml. Updated both admin_ui and RESTful API to reflect the changes.

2012-04-15 10:53:08 +01:00

extension.rb

Year updated from 2011 to 2012

2011-12-31 22:24:36 +10:00