Added language option to FacebookLike extension
Merge remote-tracking branch 'upstream/master'
Add language option to TwitterButton extension
Newline at EOF
Cleaned up code for Scrutinizer
Cleaned up code for Scrutinizer
Merge branch 'master' of https://github.com/magabriel/bolt

Conflicts:
	app/extensions/FacebookLike/extension.php
	app/extensions/TwitterButton/extension.php
New attempt for Scrutinizer...
Merge pull request #321 from magabriel/master

Add language option to FacebookLike and TwitterButton extensions
Fix when multiple is ot defined in contenttype when using strict variables
Merge pull request #324 from richardhinkamp/select-multiple-fix

Fix when multiple is not defined for select in contenttype and using strict variables
Extra replacement for windows-servers running fast_cgi: replace drive-letter in paths. Fixes #323.

Thanks, @rkmax
Added composer's new "prefer-stable" flag.

Ref: https://github.com/composer/composer/pull/1740
Whitespace..
Fix: Trying to get property of non-object [#325](https://github.com/bolt/bolt/issues/325)
Merge pull request #326 from rkmax/fixes

Fix: Trying to get property of non-object [#325](https://github.com/bolt...
ignore sublime text project files
minor fixes in translation in edit user form
translation to spanish added user; add translation in log on Adduser
Merge branch 'fixes'