First, make sure master is up to date.
git checkout master
git pull upstream master| SELECT 'music' AS 'type', ms.`title` as title, ms.`slug` as slug, ms.`id` as id, ma.`name` as artist, ms.`like_count` as like_count | |
| FROM (`music_songs` ms,`music_artists` ma) | |
| WHERE (ma.name LIKE ? OR ms.title LIKE ?) | |
| AND ms.status = 1 | |
| AND ms.artist_id = ma.id | |
| ORDER BY ms.`like_count` DESC |
| <script type="text/javascript"> | |
| document.write(unescape("%3Cscript src='" + (document.location.protocol == "https:" ? "https://sb" : "http://b") + ".scorecardresearch.com/beacon.js' %3E%3C/script%3E")); | |
| </script> | |
| <script type="text/javascript"> | |
| function trackVideoView(contentType) { | |
| var c5 = null; | |
| var contentType = contentType.toLowerCase(); | |
| switch (contentType) { | |
| case "pre": | |
| c5 = 09; |
| <?php defined('BASEPATH') || exit('No direct script access allowed'); | |
| /* | |
| Override CI loader to add comments indicating the location and count of views as they are loaded. | |
| Copyright (C) 2012 Ryan Neufeld | |
| This program is free software; you can redistribute it and/or | |
| modify it under the terms of the GNU General Public License | |
| as published by the Free Software Foundation; either version 2 | |
| of the License, or (at your option) any later version. |
| ryan@lisa ~/workspace/nickler/www$ brew info couchdb ✹ ✭ inventory | |
| couchdb: stable 1.3.0, HEAD | |
| http://couchdb.apache.org/ | |
| /usr/local/Cellar/couchdb/1.2.1 (334 files, 3.6M) | |
| Built from source | |
| /usr/local/Cellar/couchdb/1.3.0 (431 files, 6.4M) * | |
| Built from source | |
| https://github.com/mxcl/homebrew/commits/master/Library/Formula/couchdb.rb | |
| ==> Dependencies | |
| Required: spidermonkey, icu4c, erlang |
| /* Arduino SdFat Library | |
| * Copyright (C) 2009 by William Greiman | |
| * | |
| * This file is part of the Arduino SdFat Library | |
| * | |
| * This Library is free software: you can redistribute it and/or modify | |
| * it under the terms of the GNU General Public License as published by | |
| * the Free Software Foundation, either version 3 of the License, or | |
| * (at your option) any later version. | |
| * |
| config[:vms].each do |name, settings| | |
| config.vm.define(name) do |vm_config| | |
| # I need access to `name` here | |
| end | |
| end |
| ; generated by Slic3r 1.1.6 on 2014-07-09 at 18:45:35 | |
| ; perimeters extrusion width = 0.35mm | |
| ; infill extrusion width = 0.37mm | |
| ; solid infill extrusion width = 0.37mm | |
| ; top infill extrusion width = 0.37mm | |
| G21 ; set units to millimeters | |
| M107 | |
| M104 S205 ; set temperature |
| { | |
| "attrs": { | |
| "see": "https://example.com", | |
| }, | |
| "attrs2": { | |
| "see": | |
| [ | |
| "https://example.com", | |
| "https://example.com/two", | |
| ], |