panel admina
panel admina
Merge branch 'psuminski'

Conflicts:
	app/controllers/users_controller.rb
	config/routes.rb
gemlock II
gemlock II
Merge branch 'volix' of github.com:zarie/apka into volix
tempiki
Merge branch 'master' into mikolaj