Igor Zhukov 96d7f04981 Merge branch 'pr/139' ...

Conflicts:
	app/css/app.css

2014-03-12 22:59:21 +01:00

..

lib

Fixed gulp bugs

2014-03-12 22:55:12 +01:00

app.js

Fixed gulp bugs

2014-03-12 22:55:12 +01:00

background.js

Fixed gulp bugs

2014-03-12 22:55:12 +01:00

controllers.js

Merge branch 'pr/139'

2014-03-12 22:59:21 +01:00

directives.js

Merge branch 'pr/139'

2014-03-12 22:59:21 +01:00

filters.js

Fixed gulp bugs

2014-03-12 22:55:12 +01:00

services.js

Merge branch 'pr/139'

2014-03-12 22:59:21 +01:00

util.js

Fixed gulp bugs

2014-03-12 22:55:12 +01:00