Merged development into master

This commit is contained in:
NelsonLaQuet 2013-09-01 06:32:47 -05:00
commit 98289ad84b

View file

@ -24,7 +24,7 @@
</script> </script>
<header> <header>
<a href="/">Pony.fm</a> <a href="/">pony.fm</a>
<div class="now-playing"> <div class="now-playing">
@if (Auth::check()) @if (Auth::check())
<div class="user-details dropdown"> <div class="user-details dropdown">