| 
							
							
								 Dave C-J | a2b1244d54 | resolving merg conflicts with icons etc | 2014-09-03 22:18:42 +01:00 |  | 
			
				
					| 
							
							
								 Dave C-J | fe44018250 | Merge branch 'migrate-to-fa-icons' of https://github.com/hindessm/node-red-nodes into hindessm-migrate-to-fa-icons Conflicts:
	io/ping/88-ping.html
	io/wol/39-wol.html
	social/nma/57-nma.html
	social/prowl/57-prowl.html
	social/pushover/57-pushover.html
	social/twilio/56-twilio.html
	storage/sqlite/sqlite.html | 2014-09-03 22:16:02 +01:00 |  | 
			
				
					| 
							
							
								 Mark Hindess | f19ae71fb7 | Migrate icons. | 2014-09-03 16:12:26 +01:00 |  | 
			
				
					| 
							
							
								 Dave C-J | f21a08afe6 | Add prowl, nma and pushover to npm, update all to fa icons | 2014-07-27 16:09:50 +01:00 |  | 
			
				
					| 
							
							
								 Dave C-J | 62956b0bb8 | Update node-red-nodes social nodes to use strict and pass jshint scan | 2014-06-28 23:34:59 +01:00 |  | 
			
				
					| 
							
							
								 Dave C-J | 525b0aa7ac | Add Notify My Android Node - with credentials support | 2014-04-20 18:01:38 +01:00 |  |